diff --git a/res/layout/accounts_item.xml b/res/layout/accounts_item.xml
index 7d5946e5f..be051f209 100644
--- a/res/layout/accounts_item.xml
+++ b/res/layout/accounts_item.xml
@@ -2,9 +2,10 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:layout_height="?android:attr/listPreferredItemHeight"
+    android:layout_height="wrap_content"
     android:orientation="horizontal"
     android:paddingRight="6dip"
+    android:paddingBottom="2dip"
     android:gravity="center_vertical" >
 
     <View
@@ -80,6 +81,7 @@
             android:layout_alignParentBottom="true" 
             android:layout_gravity="bottom"
             android:layout_marginBottom="1dip"
+            android:layout_below="@id/new_message_count"
             android:paddingTop="6dip"
             android:paddingBottom="4dip"
             android:paddingLeft="10dip"
diff --git a/res/layout/folder_list.xml b/res/layout/folder_list.xml
new file mode 100644
index 000000000..edeeaf112
--- /dev/null
+++ b/res/layout/folder_list.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_height="fill_parent"
+    android:layout_width="fill_parent">
+    <ListView
+        android:id="@android:id/list"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        />
+ 
+</LinearLayout>
diff --git a/res/layout/folder_list_header.xml b/res/layout/folder_list_header.xml
index e2a3678e3..c2a68bc8d 100644
--- a/res/layout/folder_list_header.xml
+++ b/res/layout/folder_list_header.xml
@@ -2,7 +2,7 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:layout_height="?android:attr/listPreferredItemHeight"
+    android:layout_height="fill_parent"
     android:background="@drawable/message_list_item_footer_background"
     android:gravity="left"
     android:orientation="horizontal">
diff --git a/res/layout/folder_list_item.xml b/res/layout/folder_list_item.xml
index bdfcacc6c..c34c43f85 100644
--- a/res/layout/folder_list_item.xml
+++ b/res/layout/folder_list_item.xml
@@ -2,8 +2,9 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:layout_height="?android:attr/listPreferredItemHeight"
+    android:layout_height="wrap_content"
     android:paddingRight="4dip"
+    android:paddingBottom="2dip"
     android:orientation="horizontal"
     android:gravity="center_vertical" >
 
@@ -16,9 +17,10 @@
 
     <LinearLayout
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="fill_parent"
         android:layout_weight="1"
         android:orientation="vertical"
+        android:gravity="center_vertical"
         android:paddingLeft="6dip" >
 
         <TextView
@@ -78,6 +80,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="bottom"
             android:layout_alignParentBottom="true"
+            android:layout_below="@id/folder_unread_message_count"
             android:layout_marginBottom="1dip"
             android:paddingTop="6dip"
             android:paddingBottom="4dip"
diff --git a/src/com/fsck/k9/activity/FolderList.java b/src/com/fsck/k9/activity/FolderList.java
index cca259851..0391be347 100644
--- a/src/com/fsck/k9/activity/FolderList.java
+++ b/src/com/fsck/k9/activity/FolderList.java
@@ -255,7 +255,8 @@ public class FolderList extends K9ListActivity
     {
         super.onCreate(savedInstanceState);
         requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
-
+        
+        setContentView(R.layout.folder_list);
         mListView = getListView();
         mListView.setScrollBarStyle(View.SCROLLBARS_OUTSIDE_INSET);
         mListView.setLongClickable(true);