diff --git a/res/layout/message_list_item.xml b/res/layout/message_list_item.xml
index c642161f3..2805b2e34 100644
--- a/res/layout/message_list_item.xml
+++ b/res/layout/message_list_item.xml
@@ -1,43 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingBottom="6dip"
     android:paddingRight="4dip"
     android:paddingTop="5dip" >
 
-    <RelativeLayout
+    <LinearLayout
         android:id="@+id/chip_wrapper"
         android:layout_width="48dip"
-        android:layout_height="fill_parent"
+        android:layout_height="match_parent"
         android:layout_alignParentLeft="true"
         android:layout_centerVertical="true"
         android:layout_gravity="center|center_vertical"
         android:textColor="?android:attr/textColorPrimary" >
 
-    <View
-        android:id="@+id/chip"
-        android:layout_width="32dip"
-        android:layout_height="32dip"
-        android:layout_gravity="center|center_vertical"
-        android:layout_marginLeft="8dip"
-        android:layout_marginRight="8dip"
-        android:background="@android:color/transparent" />
+        <View
+            android:id="@+id/chip"
+            android:layout_width="32dip"
+            android:layout_height="32dip"
+            android:layout_gravity="center|center_vertical"
+            android:layout_marginLeft="8dip"
+            android:layout_marginRight="8dip"
+            android:background="@android:color/transparent" />
+
         <CheckBox
             android:id="@+id/selected_checkbox"
             android:layout_width="36dip"
-            android:layout_below="@+id/chip"
-            android:layout_centerHorizontal="true"
-            android:layout_alignParentBottom="true"
-            android:layout_height="fill_parent"
+            android:layout_height="match_parent"
             android:focusable="false"
             android:gravity="bottom|center"
             android:visibility="gone" />
-    </RelativeLayout>
+
+    </LinearLayout>
 
     <TextView
         android:id="@+id/subject"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
         android:layout_marginBottom="1dip"
@@ -51,11 +50,11 @@
 
     <TextView
         android:id="@+id/preview"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_toRightOf="@+id/chip_wrapper"
         android:layout_below="@+id/subject"
-        android:layout_toLeftOf="@+id/thread_count_wrapper"
+        android:layout_toLeftOf="@+id/thread_count"
         android:layout_marginLeft="1dip"
         android:layout_marginBottom="3dip"
         android:layout_marginRight="3dip"
@@ -64,8 +63,6 @@
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textColor="?android:attr/textColorPrimary" />
 
-
-
     <TextView
         android:id="@+id/date"
         android:layout_width="wrap_content"
@@ -77,27 +74,22 @@
         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:background="?attr/messageListThreadCountBackground"
         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:paddingRight="4dip"
         android:paddingBottom="1dip"
         android:paddingLeft="4dip"
         android:focusable="false" />
-    </LinearLayout>
+
 </RelativeLayout>
diff --git a/src/com/fsck/k9/fragment/MessageListFragment.java b/src/com/fsck/k9/fragment/MessageListFragment.java
index b8d9cd747..ce034bd31 100644
--- a/src/com/fsck/k9/fragment/MessageListFragment.java
+++ b/src/com/fsck/k9/fragment/MessageListFragment.java
@@ -1736,7 +1736,6 @@ public class MessageListFragment extends SherlockFragment implements OnItemClick
             holder.preview.setLines(Math.max(mPreviewLines,1));
             holder.preview.setTextSize(TypedValue.COMPLEX_UNIT_SP, mFontSizes.getMessageListPreview());
             holder.threadCount = (TextView) view.findViewById(R.id.thread_count);
-            holder.threadCountWrapper = view.findViewById(R.id.thread_count_wrapper);
 
             holder.selected = (CheckBox) view.findViewById(R.id.selected_checkbox);
             if (mCheckboxes) {
@@ -1843,9 +1842,9 @@ public class MessageListFragment extends SherlockFragment implements OnItemClick
             // Thread count
             if (threadCount > 1) {
                 holder.threadCount.setText(Integer.toString(threadCount));
-                holder.threadCountWrapper.setVisibility(View.VISIBLE);
+                holder.threadCount.setVisibility(View.VISIBLE);
             } else {
-                holder.threadCountWrapper.setVisibility(View.GONE);
+                holder.threadCount.setVisibility(View.GONE);
             }
 
             CharSequence beforePreviewText = (mSenderAboveSubject) ? subject : displayName;
@@ -1933,7 +1932,6 @@ public class MessageListFragment extends SherlockFragment implements OnItemClick
         public TextView date;
         public View chip;
         public TextView threadCount;
-        public View threadCountWrapper;
         public CheckBox selected;
         public int position = -1;