diff --git a/res/layout/account_folder_list_item.xml b/res/layout/account_folder_list_item.xml
index 2be96fcc7..594ea851c 100644
--- a/res/layout/account_folder_list_item.xml
+++ b/res/layout/account_folder_list_item.xml
@@ -25,7 +25,7 @@
         android:id="@+id/chip"
         android:background="@drawable/appointment_indicator_leftside_1"
         android:layout_width="4dip"
-        android:layout_height="56dip"
+        android:layout_height="fill_parent"
         android:layout_centerVertical="true" />
     <ImageView
         android:id="@+id/folder_icon"
@@ -69,13 +69,17 @@
             android:layout_marginLeft="4dip"
             style="@style/unreadCount"/>
     </LinearLayout>
+    <View
+        android:id="@+id/folder_separator"
+        android:background="@color/account_folder_list_item_background_read"
+        android:layout_width="0.5dip"
+        android:layout_height="40dip"
+        android:layout_marginLeft="5dip" />
     <ImageView
         android:id="@+id/folder_button"
         android:layout_width="40dip"
         android:layout_height="40dip"
         android:layout_alignParentRight="true"
-        android:layout_marginLeft="4dip"
-        android:layout_marginRight="4dip"
         android:minWidth="30dip"
         android:paddingTop="5dip"
         android:paddingLeft="5dip"
diff --git a/res/layout/mailbox_list_item.xml b/res/layout/mailbox_list_item.xml
index 76c14190b..4ddc57c18 100644
--- a/res/layout/mailbox_list_item.xml
+++ b/res/layout/mailbox_list_item.xml
@@ -26,7 +26,7 @@
         android:id="@+id/chip"
         android:background="@drawable/appointment_indicator_leftside_1"
         android:layout_width="4dip"
-        android:layout_height="56dip"
+        android:layout_height="fill_parent"
         android:layout_centerVertical="true" />
     <ImageView
         android:id="@+id/folder_icon"
diff --git a/res/layout/message_list_item.xml b/res/layout/message_list_item.xml
index 931ae1c05..6eabc303c 100644
--- a/res/layout/message_list_item.xml
+++ b/res/layout/message_list_item.xml
@@ -23,7 +23,7 @@
         android:id="@+id/chip"
         android:background="@drawable/appointment_indicator_leftside_1"
         android:layout_width="4dip"
-        android:layout_height="56dip"
+        android:layout_height="fill_parent"
         android:layout_centerVertical="true" />
     <!-- TODO: Remove the top padding hack and align to the subject baseline -->
     <ImageView
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 2ffb859db..58ae1bd1e 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -18,4 +18,5 @@
     <color name="folder_message_list_child_background">#3B3B3B</color>
     <color name="message_list_item_background_unread">#333333</color>
     <color name="message_list_item_background_read">#3B3B3B</color>
+    <color name="account_folder_list_item_background_read">#303030</color>
 </resources>
diff --git a/src/com/android/email/activity/AccountFolderList.java b/src/com/android/email/activity/AccountFolderList.java
index 57429318c..2d945eb0d 100644
--- a/src/com/android/email/activity/AccountFolderList.java
+++ b/src/com/android/email/activity/AccountFolderList.java
@@ -753,6 +753,7 @@ public class AccountFolderList extends ListActivity
             countView.setPadding(2, 0, 2, 0);
 
             view.findViewById(R.id.folder_button).setVisibility(View.GONE);
+            view.findViewById(R.id.folder_separator).setVisibility(View.GONE);
             view.findViewById(R.id.folder_icon).setVisibility(View.VISIBLE);
             ((ImageView)view.findViewById(R.id.folder_icon)).setImageDrawable(
                     Utility.FolderProperties.getInstance(context).getIconIds(type));
@@ -814,6 +815,7 @@ public class AccountFolderList extends ListActivity
 
             view.findViewById(R.id.folder_icon).setVisibility(View.GONE);
             view.findViewById(R.id.folder_button).setVisibility(View.VISIBLE);
+            view.findViewById(R.id.folder_separator).setVisibility(View.VISIBLE);
         }
 
         @Override