diff --git a/app/views/conversations/_conversation.haml b/app/views/conversations/_conversation.haml
index 72bc1baa6..604088436 100644
--- a/app/views/conversations/_conversation.haml
+++ b/app/views/conversations/_conversation.haml
@@ -7,6 +7,9 @@
     = person_image_tag(conversation.author)
 
     .subject
+      - if unread_counts[conversation.id].to_i > 0
+        .unread_message_count
+          = unread_counts[conversation.id].to_i
       .message_count
         = conversation.messages.size
 
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 5a4b4ee1e..956a9cd50 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -2513,6 +2513,19 @@ ul.show_comments,
       :size 12px
       :weight normal
 
+  .unread_message_count
+    @include border-radius(5px)
+
+    :right 30px
+    :background
+      :color #b11
+    :color #eee
+    :position absolute
+    :padding 0 5px
+    :font
+      :size 12px
+      :weight normal
+
   .participant_count
     :font
       :weight normal
@@ -2544,7 +2557,7 @@ ul.show_comments,
 
 .conversation.unread
   :background
-    :color lighten($background,5%)
+    :color darken($background,5%)
 
 .conversation.selected
   :background