diff --git a/res/layout/message_list.xml b/res/layout/message_list.xml
index 083fc383a..dbcdd09f4 100644
--- a/res/layout/message_list.xml
+++ b/res/layout/message_list.xml
@@ -1,58 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent" >
-    <LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/batch_button_area"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:orientation="horizontal"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"
-        android:visibility="gone"
-        android:background="#CCCCCC"
-        >
-        <ImageButton
-            android:id="@+id/batch_read_button"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:src="@drawable/ic_button_mark_read"
-        />
-        <ImageButton
-            android:id="@+id/batch_delete_button"
-            android:layout_width="0dip"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:src="@drawable/ic_button_delete"
-        />
-        <ImageButton
-            android:id="@+id/batch_flag_button"
-            android:layout_width="0dip"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:src="@drawable/ic_button_flag"
-        />
-        <ImageButton
-            android:id="@+id/batch_done_button"
-            android:layout_width="0dip"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:src="@drawable/ic_button_close_clear_cancel"
-        />
-    </LinearLayout>
+    android:layout_height="fill_parent"
+    android:orientation="vertical" >
     <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"
         android:cacheColorHint="?android:attr/colorBackground"
+        android:layout_weight="5"
+
     />
-</RelativeLayout>
+    <include layout="@layout/message_list_batch_buttons"/>
+</LinearLayout>
diff --git a/res/layout/message_list_batch_buttons.xml b/res/layout/message_list_batch_buttons.xml
new file mode 100644
index 000000000..38b5af0ae
--- /dev/null
+++ b/res/layout/message_list_batch_buttons.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/batch_button_area"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:orientation="horizontal"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:visibility="gone"
+        android:background="#CCCCCC"
+        >
+        <ImageButton
+            android:id="@+id/batch_read_button"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:src="@drawable/ic_button_mark_read"
+        />
+        <ImageButton
+            android:id="@+id/batch_delete_button"
+            android:layout_width="0dip"
+            android:layout_height="fill_parent"
+            android:layout_weight="1"
+            android:src="@drawable/ic_button_delete"
+        />
+        <ImageButton
+            android:id="@+id/batch_flag_button"
+            android:layout_width="0dip"
+            android:layout_height="fill_parent"
+            android:layout_weight="1"
+            android:src="@drawable/ic_button_flag"
+        />
+        <ImageButton
+            android:id="@+id/batch_done_button"
+            android:layout_width="0dip"
+            android:layout_height="fill_parent"
+            android:layout_weight="1"
+            android:src="@drawable/ic_button_close_clear_cancel"
+        />
+    </LinearLayout>