diff --git a/src/browser/index.jsx b/src/browser/index.jsx
index 43790a6b..c778c6af 100644
--- a/src/browser/index.jsx
+++ b/src/browser/index.jsx
@@ -23,7 +23,8 @@ var MainPage = React.createClass({
   getInitialState: function() {
     return {
       key: 0,
-      unreadCounts: new Array(this.props.teams.length)
+      unreadCounts: new Array(this.props.teams.length),
+      mentionCounts: new Array(this.props.teams.length)
     };
   },
   componentDidMount: function() {
@@ -44,17 +45,23 @@ var MainPage = React.createClass({
       key: key
     });
   },
-  handleUnreadCountChange: function(index, count) {
-    var counts = this.state.unreadCounts;
-    counts[index] = count;
+  handleUnreadCountChange: function(index, unreadCount, mentionCount) {
+    var unreadCounts = this.state.unreadCounts;
+    var mentionCounts = this.state.mentionCounts;
+    unreadCounts[index] = unreadCount;
+    mentionCounts[index] = mentionCount;
     this.setState({
-      unreadCounts: counts
+      unreadCounts: unreadCounts,
+      mentionCounts: mentionCounts
     });
     if (this.props.onUnreadCountChange) {
-      var c = counts.reduce(function(prev, curr) {
+      var allUnreadCount = unreadCounts.reduce(function(prev, curr) {
         return prev + curr;
       });
-      this.props.onUnreadCountChange(c);
+      var allMentionCount = mentionCounts.reduce(function(prev, curr) {
+        return prev + curr;
+      });
+      this.props.onUnreadCountChange(allUnreadCount, allMentionCount);
     }
   },
   visibleStyle: function(visible) {
@@ -75,14 +82,14 @@ var MainPage = React.createClass({
     if (this.props.teams.length > 1) {
       tabs_row = (
         <Row>
-          <TabBar id="tabBar" teams={ this.props.teams } unreadCounts={ this.state.unreadCounts } activeKey={ this.state.key } onSelect={ this.handleSelect }></TabBar>
+          <TabBar id="tabBar" teams={ this.props.teams } unreadCounts={ this.state.unreadCounts } mentionCounts={ this.state.mentionCounts } activeKey={ this.state.key } onSelect={ this.handleSelect }></TabBar>
         </Row>
       );
     }
 
     var views = this.props.teams.map(function(team, index) {
-      var handleUnreadCountChange = function(count) {
-        thisObj.handleUnreadCountChange(index, count);
+      var handleUnreadCountChange = function(unreadCount, mentionCount) {
+        thisObj.handleUnreadCountChange(index, unreadCount, mentionCount);
       };
       var handleNotificationClick = function() {
         thisObj.handleSelect(index);
@@ -107,9 +114,13 @@ var TabBar = React.createClass({
     var thisObj = this;
     var tabs = this.props.teams.map(function(team, index) {
       var badge;
-      if (thisObj.props.unreadCounts[index] != 0) {
+      if (thisObj.props.mentionCounts[index] != 0) {
         badge = (<Badge>
-                   { thisObj.props.unreadCounts[index] }
+                   { thisObj.props.mentionCounts[index] }
+                 </Badge>);
+      } else if (thisObj.props.unreadCounts[index] != 0) {
+        badge = (<Badge>
+                   *
                  </Badge>);
       }
       return (<NavItem className="teamTabItem" id={ 'teamTabItem' + index } eventKey={ index }>
@@ -132,12 +143,13 @@ var MattermostView = React.createClass({
       unreadCount: 0
     };
   },
-  handleUnreadCountChange: function(count) {
+  handleUnreadCountChange: function(unreadCount, mentionCount) {
     this.setState({
-      unreadCount: count
+      unreadCount: unreadCount,
+      mentionCount: mentionCount
     });
     if (this.props.onUnreadCountChange) {
-      this.props.onUnreadCountChange(count);
+      this.props.onUnreadCountChange(unreadCount, mentionCount);
     }
   },
   componentDidMount: function() {
@@ -187,10 +199,15 @@ var MattermostView = React.createClass({
       switch (event.channel) {
         case 'onUnreadCountChange':
           var unreadCount = event.args[0];
-          thisObj.handleUnreadCountChange(unreadCount);
+          var mentionCount = event.args[1];
+          thisObj.handleUnreadCountChange(unreadCount, mentionCount);
           break;
         case 'onNotificationClick':
           thisObj.props.onNotificationClick();
+          break;
+        case 'console':
+          console.log(event.args[0]);
+          break;
       }
     });
 
@@ -220,19 +237,21 @@ window.addEventListener('contextmenu', function(e) {
   menu.popup(remote.getCurrentWindow());
 }, false);
 
-var showUnreadBadge = function(unreadCount) {
+var showUnreadBadge = function(unreadCount, mentionCount) {
   switch (process.platform) {
     case 'win32':
       var window = remote.getCurrentWindow();
-      if (unreadCount > 0) {
+      if (unreadCount > 0 || mentionCount > 0) {
         window.setOverlayIcon(path.join(__dirname, '../resources/badge.png'), 'You have unread channels.');
       } else {
         window.setOverlayIcon(null, '');
       }
       break;
     case 'darwin':
-      if (unreadCount > 0) {
-        remote.app.dock.setBadge(unreadCount.toString());
+      if (mentionCount > 0) {
+        remote.app.dock.setBadge(mentionCount.toString());
+      } else if (mentionCount < unreadCount) {
+        remote.app.dock.setBadge('*');
       } else {
         remote.app.dock.setBadge('');
       }
diff --git a/src/browser/webview/mattermost.js b/src/browser/webview/mattermost.js
index 779f49a3..86b1b3f3 100644
--- a/src/browser/webview/mattermost.js
+++ b/src/browser/webview/mattermost.js
@@ -5,25 +5,51 @@ const ipc = electron.ipcRenderer;
 const NativeNotification = Notification;
 
 var unreadCountTimer = setInterval(function() {
-  if (!this.count) {
-    this.count = 0;
+  if (!this.unreadCount) {
+    this.unreadCount = 0;
+  }
+  if (!this.mentionCount) {
+    this.mentionCount = 0;
   }
 
-  // count in sidebar
+  // unreadCount in sidebar
   var unreadCount = document.getElementsByClassName('unread-title').length;
+  // mentionCount in sidebar
+  var elem = document.getElementsByClassName('badge')
+  var mentionCount = 0;
+  for (var i = 0; i < elem.length; i++) {
+    if (elem[i].offsetHeight != 0) {
+      mentionCount++;
+    }
+  }
+  ipc.sendToHost('console', "sidebar(unread=" + unreadCount +", mention=" + mentionCount + ")");
 
-  // count for active channel
+  // unreadCount for active channel
   var newSeparators = document.getElementsByClassName('new-separator');
+  var post;
   for (var i = 0; i < newSeparators.length; i++) {
     if (newSeparators[i].offsetParent !== null) {
       unreadCount += 1;
+      post = newSeparators[i];
     }
   }
-
-  if (this.count != unreadCount) {
-    ipc.sendToHost('onUnreadCountChange', unreadCount);
+  // mentionCount for active channel
+  if (post != null) {
+    while (post = post.nextSibling) {
+      var highlight = post.getElementsByClassName('mention-highlight');
+      if (highlight.length != 0 && highlight[0].offsetHeight != null) {
+        mentionCount++;
+        break;
+      }
+    }
   }
-  this.count = unreadCount;
+  ipc.sendToHost('console', "sidebar + active(unread=" + unreadCount +", mention=" + mentionCount + ")");
+
+  if (this.unreadCount != unreadCount || this.mentionCount != mentionCount) {
+    ipc.sendToHost('onUnreadCountChange', unreadCount, mentionCount);
+  }
+  this.unreadCount = unreadCount;
+  this.mentionCount = mentionCount;
 }, 1000);
 
 // On Windows 8.1 and Windows 8, a shortcut with a Application User Model ID must be installed to the Start screen.