diff --git a/res/drawable/thread_count_box_dark.xml b/res/drawable/thread_count_box_dark.xml
new file mode 100644
index 000000000..c9e4db53a
--- /dev/null
+++ b/res/drawable/thread_count_box_dark.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@android:color/tertiary_text_dark"/>
+    <!-- A hack because we can't set the color to a theme attribute like ?attr/messageListThreadCountBackgroundColor" -->
+    <corners android:radius="4dp"/>
+
+</shape>
diff --git a/res/drawable/thread_count_box_light.xml b/res/drawable/thread_count_box_light.xml
new file mode 100644
index 000000000..3f5d4f3f2
--- /dev/null
+++ b/res/drawable/thread_count_box_light.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@android:color/tertiary_text_light"/>
+    <!-- A hack because we can't set the color to a theme attribute like ?attr/messageListThreadCountBackgroundColor" -->
+    <corners android:radius="4dp"/>
+
+</shape>
diff --git a/res/layout/message_list_item.xml b/res/layout/message_list_item.xml
index 9cb0d3fc4..c642161f3 100644
--- a/res/layout/message_list_item.xml
+++ b/res/layout/message_list_item.xml
@@ -55,7 +55,7 @@
         android:layout_height="wrap_content"
         android:layout_toRightOf="@+id/chip_wrapper"
         android:layout_below="@+id/subject"
-        android:layout_toLeftOf="@+id/thread_count"
+        android:layout_toLeftOf="@+id/thread_count_wrapper"
         android:layout_marginLeft="1dip"
         android:layout_marginBottom="3dip"
         android:layout_marginRight="3dip"
@@ -64,21 +64,6 @@
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textColor="?android:attr/textColorPrimary" />
 
-    <TextView
-        android:id="@+id/thread_count"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="6dip"
-        android:layout_marginRight="12dip"
-        android:layout_alignParentRight="true"
-        android:layout_below="@+id/subject"
-        android:gravity="center_vertical|center_horizontal"
-        android:paddingLeft="4dip"
-        android:paddingRight="4dip"
-        android:paddingTop="2dip"
-        android:paddingBottom="2dip"
-        android:background="#50000000"
-        android:focusable="false" />
 
 
     <TextView
@@ -92,5 +77,27 @@
         android:singleLine="true"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textColor="?android:attr/textColorSecondary" />
-
+    <LinearLayout
+            android:id="@+id/thread_count_wrapper"
+            android:orientation="vertical"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/date"
+            android:layout_alignTop="@+id/preview"
+            android:layout_alignParentRight="true"
+            android:layout_marginLeft="4dip"
+            android:layout_marginRight="2dip"
+            android:background="?attr/messageListThreadCountBackground"
+            >
+    <TextView
+        android:id="@+id/thread_count"
+        android:layout_gravity="center|center_vertical"
+        android:textColor="?attr/messageListThreadCountForegroundColor"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingRight="4dip"
+        android:paddingBottom="1dip"
+        android:paddingLeft="4dip"
+        android:focusable="false" />
+    </LinearLayout>
 </RelativeLayout>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 9647e350d..745643fdd 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -45,6 +45,9 @@
         <attr name="backgroundColorChooseAccountHeader" format="color" />
         <attr name="messageListReadItemBackgroundColor" format="reference|color"/>
         <attr name="messageListUnreadItemBackgroundColor" format="reference|color"/>
+        <attr name="messageListThreadCountForegroundColor" format="reference|color"/>
+        <attr name="messageListThreadCountBackground" format="reference|color"/>
+
     </declare-styleable>
 
 </resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index d5ed66241..40de27438 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -44,6 +44,8 @@
         <item name="textColorSecondaryRecipientDropdown">@android:color/secondary_text_light</item>
         <item name="messageListReadItemBackgroundColor">#80cdcdcd</item>
         <item name="messageListUnreadItemBackgroundColor">#00ffffff</item>
+        <item name="messageListThreadCountForegroundColor">?android:attr/colorBackground</item>
+        <item name="messageListThreadCountBackground">@drawable/thread_count_box_light</item>
     </style>
 
     <style name="Theme.K9.Dark.Base" parent="Theme.Sherlock">
@@ -89,6 +91,8 @@
         <item name="textColorSecondaryRecipientDropdown">@android:color/secondary_text_dark</item>
         <item name="messageListReadItemBackgroundColor">#00000000</item>
         <item name="messageListUnreadItemBackgroundColor">#805a5a5a</item>
+        <item name="messageListThreadCountForegroundColor">?android:attr/colorBackground</item>
+        <item name="messageListThreadCountBackground">@drawable/thread_count_box_dark</item>
     </style>
 
     <style name="Theme.K9.Light" parent="Theme.K9.Light.Base">