diff --git a/res/layout/message_list_item.xml b/res/layout/message_list_item.xml
index 04985fa49..9eabc8192 100644
--- a/res/layout/message_list_item.xml
+++ b/res/layout/message_list_item.xml
@@ -71,8 +71,9 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_toRightOf="@id/contact_badge"
-                android:layout_toLeftOf="@+id/date"
+                android:layout_toLeftOf="@+id/thread_count"
                 android:layout_alignParentTop="true"
+                android:layout_alignWithParentIfMissing="true"
                 >
 
             <TextView
@@ -147,13 +148,13 @@
                 android:layout_gravity="center|center_vertical"
                 android:textColor="?attr/messageListThreadCountForegroundColor"
                 android:background="?attr/messageListThreadCountBackground"
+                android:layout_toLeftOf="@id/date"
+                android:layout_alignWithParentIfMissing="true"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignTop="@+id/preview"
-                android:layout_alignParentRight="true"
-                android:layout_below="@+id/date"
-                android:layout_marginLeft="4dip"
-                android:layout_marginRight="2dip"
+                android:layout_centerVertical="@+id/subject_wrapper"
+                android:layout_marginLeft="3dip"
+                android:layout_marginRight="4dip"
                 android:paddingRight="4dip"
                 android:paddingBottom="1dip"
                 android:paddingLeft="4dip"
diff --git a/src/com/fsck/k9/fragment/MessageListFragment.java b/src/com/fsck/k9/fragment/MessageListFragment.java
index f5e1fcba3..f369d8988 100644
--- a/src/com/fsck/k9/fragment/MessageListFragment.java
+++ b/src/com/fsck/k9/fragment/MessageListFragment.java
@@ -1847,6 +1847,7 @@ public class MessageListFragment extends SherlockFragment implements OnItemClick
             holder.preview.setLines(Math.max(mPreviewLines,1));
             mFontSizes.setViewTextSize(holder.preview, mFontSizes.getMessageListPreview());
             holder.threadCount = (TextView) view.findViewById(R.id.thread_count);
+            mFontSizes.setViewTextSize(holder.threadCount, mFontSizes.getMessageListSubject()); // thread count is next to subject
             view.findViewById(R.id.selected_checkbox_wrapper).setVisibility((mCheckboxes) ? View.VISIBLE : View.GONE);
 
             holder.flagged = (CheckBox) view.findViewById(R.id.flagged);