diff --git a/res/layout/message_list_item.xml b/res/layout/message_list_item.xml
index efd118c2b..4e5b99627 100644
--- a/res/layout/message_list_item.xml
+++ b/res/layout/message_list_item.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:paddingBottom="5dip"
+    android:paddingBottom="2dip"
     android:paddingRight="3dip"
     android:paddingTop="5dip" >
 
@@ -55,53 +55,52 @@
         android:layout_toRightOf="@+id/chip_wrapper"
         android:layout_below="@+id/subject"
         android:layout_marginLeft="1dip"
+        android:layout_marginBottom="3dip"
+        android:layout_marginRight="16dip"
         android:layout_toLeftOf="@+id/flagged"
         android:bufferType="spannable"
         android:singleLine="false"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textColor="?android:attr/textColorPrimary" />
-
-    <com.fsck.k9.view.ImageButtonAnchor
-        android:id="@+id/item_menu"
-        android:layout_width="36dp"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_centerVertical="true"
-        android:background="@null"
-        style="?android:attr/borderlessButtonStyle"
-        android:src="?attr/iconListItemMenu" />
-
-    <CheckBox
-        android:id="@+id/flagged"
-        style="?android:attr/starStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_toLeftOf="@+id/divider"
-        android:focusable="false"
-        android:gravity="top|right" />
-
     <TextView
         android:id="@+id/date"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignTop="@+id/subject"
-        android:layout_toLeftOf="@+id/divider"
-        android:paddingLeft="5dip"
+        android:layout_alignParentRight="true"
+        android:paddingLeft="3dip"
+        android:layout_marginRight="2dip"
         android:singleLine="true"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textColor="?android:attr/textColorSecondary" />
 
-    <ImageView
-        android:id="@+id/divider"
-          android:layout_width="1dip"
-            android:layout_height="fill_parent"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentBottom="true"
-            android:layout_marginBottom="4dip"
-            android:layout_marginTop="4dip"
-            android:layout_centerHorizontal="true"
-            android:layout_toLeftOf="@+id/item_menu"
+
+    <CheckBox
+        android:id="@+id/flagged"
+        android:button="@drawable/star"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/date"
+        android:layout_alignParentRight="true"
+        android:layout_marginTop="3dip"
+        android:layout_marginLeft="0dip"
+        android:layout_marginRight="12dip"
+        android:focusable="false"
         />
 
+    <!-- This comes after the flagged checkbox so that it layers on top and gets
+         clicks first -->
+    <com.fsck.k9.view.ImageButtonAnchor
+        android:id="@+id/item_menu"
+        android:layout_width="30dp"
+        android:layout_height="fill_parent"
+        android:gravity="bottom|right"
+        android:layout_marginBottom="0dip"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentBottom="true"
+        android:background="@null"
+        style="?android:attr/borderlessButtonStyle"
+        android:src="?attr/iconListItemMenu" />
+
+
 </RelativeLayout>