diff --git a/client/startup/startup.coffee b/client/startup/startup.coffee
index 58ff5cbe5d9a..20b1783f4203 100644
--- a/client/startup/startup.coffee
+++ b/client/startup/startup.coffee
@@ -81,15 +81,15 @@ Meteor.startup ->
 				KonchatNotification.newMessage()
 
 	Tracker.autorun ->
-		unreadCount = 0
-		subscriptions = ChatSubscription.find({}, { fields: { unread: 1 } })
-		(unreadCount += r.unread) for r in subscriptions.fetch()
+		mentionsCount = 0
+		subscriptions = ChatSubscription.find({}, { fields: { mentions: 1 } })
+		(mentionsCount += r.mentions) for r in subscriptions.fetch()
 
 		rxFavico.set 'type', 'warn'
-		rxFavico.set 'count', unreadCount
+		rxFavico.set 'count', mentionsCount
 
-		if unreadCount > 0
-			document.title = '(' + unreadCount + ') Rocket.Chat'
+		if mentionsCount > 0
+			document.title = '(' + mentionsCount + ') Rocket.Chat'
 		else
 			document.title = 'Rocket.Chat'
 
diff --git a/client/stylesheets/base.less b/client/stylesheets/base.less
index 55f112263d8b..923fd6e63008 100644
--- a/client/stylesheets/base.less
+++ b/client/stylesheets/base.less
@@ -1159,7 +1159,7 @@ a.github-fork {
 			}
 		}
 	}
-	.unread {
+	.mentions {
 		background-color: #1dce73;
 		min-width: 15px;
 		padding: 0 2px;
@@ -1208,7 +1208,11 @@ a.github-fork {
 					background-color: transparent;
 				}
 			}
-			&.has-unread {
+			&.has-unread a, &.has-mentions a {
+				font-weight: bold;
+				color: #fff;
+			}
+			&.has-mentions {
 				.opt {
 					opacity: 0;
 				}
diff --git a/client/views/app/sideNav/chatRoomItem.coffee b/client/views/app/sideNav/chatRoomItem.coffee
index d87326a7e9e3..f61948f912b3 100644
--- a/client/views/app/sideNav/chatRoomItem.coffee
+++ b/client/views/app/sideNav/chatRoomItem.coffee
@@ -5,6 +5,12 @@ Template.chatRoomItem.helpers
 		else if Router.current().params._id is this.rid and this.unread > 0
 			Meteor.call 'readMessages', this.rid
 
+	mentions: ->
+		if (not Router.current().params._id) or Router.current().params._id isnt this.rid
+			return this.mentions
+		else if Router.current().params._id is this.rid and this.mentions > 0
+			Meteor.call 'readMessages', this.rid
+
 	isDirectRoom: ->
 		return this.t is 'd'
 
diff --git a/client/views/app/sideNav/chatRoomItem.html b/client/views/app/sideNav/chatRoomItem.html
index 348ef065994b..538820186be0 100644
--- a/client/views/app/sideNav/chatRoomItem.html
+++ b/client/views/app/sideNav/chatRoomItem.html
@@ -1,8 +1,8 @@
 <template name="chatRoomItem">
-	<li class="link-room-{{rid}} {{active}} {{#if unread}}has-unread{{/if}}">
+	<li class="link-room-{{rid}} {{active}} {{#if unread}}has-unread{{/if}} {{#if mentions}}has-mentions{{/if}}">
 		<a href="{{ pathFor 'room' _id=rid}}" title="{{name}}">
-			{{#if unread}}
-				<span class="unread">{{unread}}</span>
+			{{#if mentions}}
+				<span class="mentions">{{mentions}}</span>
 			{{/if}}
 			<i class="{{roomIcon}} {{userStatus}}"></i>
 			<span>{{name}}</span>
diff --git a/server/methods/addUserToRoom.coffee b/server/methods/addUserToRoom.coffee
index 4c257bd524d2..dcfad3ae9eb0 100644
--- a/server/methods/addUserToRoom.coffee
+++ b/server/methods/addUserToRoom.coffee
@@ -31,6 +31,7 @@ Meteor.methods
 			rn: room.name
 			t: room.t
 			unread: 0
+			mentions: 0
 
 		ChatMessage.insert
 			rid: data.rid
diff --git a/server/methods/canAccessRoom.coffee b/server/methods/canAccessRoom.coffee
index 5a5bc8675281..6b477066ce98 100644
--- a/server/methods/canAccessRoom.coffee
+++ b/server/methods/canAccessRoom.coffee
@@ -29,6 +29,7 @@ Meteor.methods
 				rn: room.name
 				t: room.t
 				unread: 0
+				mentions: 0
 			$set:
 				ls: (new Date())
 				ts: (new Date())
diff --git a/server/methods/createChannel.coffee b/server/methods/createChannel.coffee
index 6363516c9c0e..ab37d525254e 100644
--- a/server/methods/createChannel.coffee
+++ b/server/methods/createChannel.coffee
@@ -37,6 +37,7 @@ Meteor.methods
 				rn: name
 				t: 'c'
 				unread: 0
+				mentions: 0
 
 			if username is Meteor.user().username
 				sub.ls = now
diff --git a/server/methods/createDirectRoom.coffee b/server/methods/createDirectRoom.coffee
index a4fffc1feadd..f8c9a8d9879d 100644
--- a/server/methods/createDirectRoom.coffee
+++ b/server/methods/createDirectRoom.coffee
@@ -32,6 +32,7 @@ Meteor.methods
 			$setOnInsert:
 				t: 'd'
 				unread: 0
+				mentions: 0
 				'u._id': userTo._id
 
 		ChatSubscription.upsert { $and: [{'u._id': userTo._id}], rid: roomId },
@@ -40,6 +41,7 @@ Meteor.methods
 			$setOnInsert:
 				t: 'd'
 				unread: 0
+				mentions: 0
 				'u._id': userTo._id
 
 		return {
diff --git a/server/methods/createPrivateGroup.coffee b/server/methods/createPrivateGroup.coffee
index 19ea205ada1f..4f273ff3ef78 100644
--- a/server/methods/createPrivateGroup.coffee
+++ b/server/methods/createPrivateGroup.coffee
@@ -34,6 +34,7 @@ Meteor.methods
 				rn: name
 				t: 'p'
 				unread: 0
+				mentions: 0
 
 			if username is Meteor.user().username
 				sub.ls = now
diff --git a/server/methods/readMessages.coffee b/server/methods/readMessages.coffee
index b1d3cf583872..40c97fbec55e 100644
--- a/server/methods/readMessages.coffee
+++ b/server/methods/readMessages.coffee
@@ -8,4 +8,4 @@ Meteor.methods
 		else
 			throw new Meteor.Error 203, '[methods] readMessages -> Invalid user'
 
-		ChatSubscription.update filter, { $set: { unread: 0, ls: (new Date()) } }
+		ChatSubscription.update filter, { $set: { unread: 0, mentions: 0, ls: (new Date()) } }
diff --git a/server/methods/sendMessage.coffee b/server/methods/sendMessage.coffee
index efb7f943f85a..ed042048bd4e 100644
--- a/server/methods/sendMessage.coffee
+++ b/server/methods/sendMessage.coffee
@@ -62,6 +62,18 @@ Meteor.methods
 		# increment unread counter on which user in room
 		Meteor.defer -> ChatSubscription.update activityFilter, { $inc: { unread: 1 }, $set: { ts: now } }, { multi: true }
 
+		updateMentions = (username, rid) ->
+			user = Meteor.users.findOne({username: username}, {fields: {_id: 1}})
+			if !user
+				return
+			filter = { rid: rid, 'u._id': user._id }
+			Meteor.defer -> ChatSubscription.update filter, { $inc: { mentions: 1 }, $set: { ts: now } }, { multi: true }
+
+		if mentions
+			updateMentions m.username, rid for m in mentions
+
+		Meteor.defer -> ChatSubscription.update activityFilter, { $inc: { unread: 1 }, $set: { ts: now } }, { multi: true }
+
 		return retObj
 
 	updateMessage: (msg) ->
diff --git a/server/methods/setUsername.coffee b/server/methods/setUsername.coffee
index ef0967580fe5..1392e6eb63f8 100644
--- a/server/methods/setUsername.coffee
+++ b/server/methods/setUsername.coffee
@@ -44,6 +44,7 @@ Meteor.methods
 					f: true
 					ts: new Date()
 					unread: 0
+					mentions: 0
 
 				ChatMessage.insert
 					u: