diff --git a/app/assets/stylesheets/conversations.css.scss b/app/assets/stylesheets/conversations.css.scss
index ef3822f96..05bbad354 100644
--- a/app/assets/stylesheets/conversations.css.scss
+++ b/app/assets/stylesheets/conversations.css.scss
@@ -102,24 +102,12 @@
   }
 
   .message_count, .unread_message_count {
-    @include border-radius(5px);
+    margin-right: 3px;
     float: right;
-    padding: 0px 6px;
-    position: relative;
-    color: $background-grey;
     font-size: 12px;
     font-weight: normal;
   }
   
-  .message_count { 
-    background-color: #999;
-    right: 0px;
-  }
-  .unread_message_count { 
-    background-color: #b11;
-    right: 4px;
-  }
-  
   .participants_link {
     clear: right;
     float: right;
@@ -127,7 +115,6 @@
   }
 
   .icons-users {
-    margin-left: 4px;
     display: block;
     width: 25px;
     height: 16px;
diff --git a/app/views/conversations/_conversation_subject.haml b/app/views/conversations/_conversation_subject.haml
index dc0b32b15..82c7f4d77 100644
--- a/app/views/conversations/_conversation_subject.haml
+++ b/app/views/conversations/_conversation_subject.haml
@@ -1,8 +1,8 @@
 .subject
-  .message_count
+  .label.label-dafault.message_count
     = conversation.messages.size
   - if unread_count > 0
-    .unread_message_count
+    .label.label-important.unread_message_count
       = unread_count
 
   %div{ :class => direction_for(conversation.subject) }