diff --git a/res/layout/message_list.xml b/res/layout/message_list.xml
index 334a7bfa6..fc42b0652 100644
--- a/res/layout/message_list.xml
+++ b/res/layout/message_list.xml
@@ -3,13 +3,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent" >
-    <ListView
-        android:id="@+id/message_list"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_centerHorizontal="true"
-    />
     <LinearLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/batch_button_area"
@@ -45,4 +38,13 @@
             android:text="Flag"
         />
     </LinearLayout>
+    <ListView
+        android:id="@+id/message_list"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_above="@id/batch_button_area"
+        android:layout_alignWithParentIfMissing="true"
+        android:layout_alignParentTop="true"
+        android:layout_centerHorizontal="true"
+    />
 </RelativeLayout>