diff --git a/res/layout/message_list_item.xml b/res/layout/message_list_item.xml
index 260f2e894..e547974de 100644
--- a/res/layout/message_list_item.xml
+++ b/res/layout/message_list_item.xml
@@ -28,8 +28,11 @@
             android:paddingTop="5dip">
 
         <LinearLayout
-                android:id="@+id/checkbox_wrapper"
-                android:layout_width="42dip"
+                android:id="@+id/selected_checkbox_wrapper"
+                android:layout_width="wrap_content"
+                android:paddingRight="8dp"
+                android:paddingLeft="8dp"
+
                 android:layout_height="match_parent"
                 android:layout_alignParentLeft="true"
                 android:layout_centerVertical="true"
@@ -45,7 +48,7 @@
                     android:button="?attr/messageListCheckbox"
                     android:focusable="false"
                     android:clickable="false"
-                    android:visibility="gone"/>
+                    />
 
         </LinearLayout>
 
@@ -57,7 +60,8 @@
                 android:layout_marginBottom="3dip"
                 android:layout_height="40dip"
                 android:layout_width="40dip"
-                android:layout_toRightOf="@id/checkbox_wrapper"
+                android:layout_alignWithParentIfMissing="true"
+                android:layout_toRightOf="@id/selected_checkbox_wrapper"
                 android:src="@drawable/ic_contact_picture"
                 style="?android:attr/quickContactBadgeStyleWindowLarge"
                 android:background="@android:color/transparent"/>
diff --git a/src/com/fsck/k9/fragment/MessageListFragment.java b/src/com/fsck/k9/fragment/MessageListFragment.java
index 1f2fd9fb2..1f81bc7d6 100644
--- a/src/com/fsck/k9/fragment/MessageListFragment.java
+++ b/src/com/fsck/k9/fragment/MessageListFragment.java
@@ -1845,11 +1845,11 @@ 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);
+            view.findViewById(R.id.selected_checkbox_wrapper).setVisibility((mCheckboxes) ? View.VISIBLE : View.GONE);
 
             holder.selected = (CheckBox) view.findViewById(R.id.selected_checkbox);
-            holder.selected.setVisibility((mCheckboxes) ? View.VISIBLE : View.GONE);
+            holder.selected.setOnClickListener(holder);
 
-            view.findViewById(R.id.checkbox_wrapper).setOnClickListener(holder);
 
             view.setTag(holder);