diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 86d6081c5..6dda45d30 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -15,7 +15,8 @@
                 android:label="@string/read_attachment_label"
                 android:description="@string/read_attachment_desc"/>
     <uses-permission android:name="com.android.email.permission.READ_ATTACHMENT"/>
-    <application android:icon="@drawable/icon" android:label="@string/app_name" android:name="K9">
+    <application android:icon="@drawable/icon" android:label="@string/app_name" android:name="K9"
+        android:theme="@android:style/Theme.Light">
         <activity android:name="com.android.email.activity.Welcome">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/res/drawable/folder_message_list_child_footer_background.xml b/res/drawable/folder_message_list_child_footer_background.xml
new file mode 100644
index 000000000..638fb001c
--- /dev/null
+++ b/res/drawable/folder_message_list_child_footer_background.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_window_focused="false" android:state_selected="true"
+        android:drawable="@color/folder_message_list_child_footer_background" />
+    <item android:state_selected="true"
+        android:drawable="@android:color/transparent" />
+    <item android:state_pressed="true" android:state_selected="false"
+        android:drawable="@android:color/transparent" />
+    <item android:state_selected="false"
+        android:drawable="@color/folder_message_list_child_footer_background" />
+</selector>
diff --git a/res/drawable/folder_message_list_group_background.xml b/res/drawable/folder_message_list_group_background.xml
new file mode 100644
index 000000000..187c96356
--- /dev/null
+++ b/res/drawable/folder_message_list_group_background.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_window_focused="false" android:state_selected="true"
+        android:drawable="@color/folder_message_list_group_background" />
+    <item android:state_selected="true"
+        android:drawable="@android:color/transparent" />
+    <item android:state_pressed="true" android:state_selected="false"
+        android:drawable="@android:color/transparent" />
+    <item android:state_selected="false"
+        android:drawable="@color/folder_message_list_group_background" />
+</selector>
diff --git a/res/layout-land/folder_message_list_child.xml b/res/layout-land/folder_message_list_child.xml
index 3fcf06901..76532a172 100644
--- a/res/layout-land/folder_message_list_child.xml
+++ b/res/layout-land/folder_message_list_child.xml
@@ -18,7 +18,7 @@
         android:ellipsize="end"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:singleLine="true"
-        android:textColor="?android:attr/textColorPrimary"
+        android:textColor="?android:attr/textColorPrimaryInverse"
         android:layout_width="50px"
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true" />
@@ -29,7 +29,7 @@
         android:layout_width="110px"
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textColor="?android:attr/textColorSecondary"
+        android:textColor="?android:attr/textColorSecondaryInverse"
         android:paddingLeft="3px"
         android:paddingRight="3px"
         android:layout_toLeftOf="@+id/date" />
@@ -38,7 +38,7 @@
         android:ellipsize="end"
         android:singleLine="true"
         android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textColor="?android:attr/textColorPrimary"
+        android:textColor="?android:attr/textColorPrimaryInverse"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:paddingLeft="10px"
diff --git a/res/layout/account_setup_account_type.xml b/res/layout/account_setup_account_type.xml
index 7a6d4db13..357d90e0d 100644
--- a/res/layout/account_setup_account_type.xml
+++ b/res/layout/account_setup_account_type.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
+    
+    android:padding="6dip"
       android:layout_height="fill_parent"
     android:orientation="vertical"
       >
@@ -10,29 +12,34 @@
         android:layout_width="fill_parent"
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:textColor="?android:attr/textColorPrimary"
+        android:paddingBottom="10dip"
           />
     <Button
         android:id="@+id/pop"
         android:text="@string/account_setup_account_type_pop_action"
         android:layout_height="wrap_content"
-        android:layout_width="150sp"
+        android:layout_width="fill_parent"
         android:minWidth="@dimen/button_minWidth"
         android:layout_gravity="center_horizontal"
+        android:layout_centerInParent="true"
+        android:padding="10dip"
         />
     <Button
         android:id="@+id/imap"
         android:text="@string/account_setup_account_type_imap_action"
         android:layout_height="wrap_content"
-        android:layout_width="150sp"
+        android:layout_width="fill_parent"
         android:minWidth="@dimen/button_minWidth"
         android:layout_gravity="center_horizontal"
+        android:padding="10dip"
         />
     <Button
         android:id="@+id/webdav"
         android:text="@string/account_setup_account_type_webdav_action"
         android:layout_height="wrap_content"
-        android:layout_width="150sp"
+        android:layout_width="fill_parent"
         android:minWidth="@dimen/button_minWidth"
         android:layout_gravity="center_horizontal"
+        android:padding="10dip"
         />
 </LinearLayout>
diff --git a/res/layout/account_setup_basics.xml b/res/layout/account_setup_basics.xml
index a77c5351e..00a43ee59 100644
--- a/res/layout/account_setup_basics.xml
+++ b/res/layout/account_setup_basics.xml
@@ -3,6 +3,8 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="vertical"
+    android:padding="6dip"
+    
       >
       <TextView
         android:text="@string/account_setup_basics_instructions"
@@ -10,6 +12,7 @@
         android:layout_width="fill_parent"
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:textColor="?android:attr/textColorPrimary"
+        android:paddingBottom="10dip"
           />
     <EditText
         android:id="@+id/account_email"
@@ -42,7 +45,7 @@
     <RelativeLayout
         android:layout_width="fill_parent"
         android:layout_height="54px"
-        android:background="@drawable/bottombar_565"
+        
         >
         <Button
             android:id="@+id/manual_setup"
diff --git a/res/layout/account_setup_check_settings.xml b/res/layout/account_setup_check_settings.xml
index 19bdbc7dc..21f08706b 100644
--- a/res/layout/account_setup_check_settings.xml
+++ b/res/layout/account_setup_check_settings.xml
@@ -3,6 +3,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
+    
+    android:padding="6dip"
     android:orientation="vertical">
     <View
         android:layout_width="fill_parent"
@@ -27,7 +29,8 @@
     <RelativeLayout
         android:layout_width="fill_parent"
         android:layout_height="54px"
-        android:background="@drawable/bottombar_565">
+        
+        >
         <Button
             android:id="@+id/cancel"
             android:text="@string/cancel_action"
diff --git a/res/layout/account_setup_composition.xml b/res/layout/account_setup_composition.xml
index b5f0361e9..13eec490a 100644
--- a/res/layout/account_setup_composition.xml
+++ b/res/layout/account_setup_composition.xml
@@ -3,6 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
+    
     android:scrollbarStyle="outsideInset">
     <LinearLayout
         android:layout_width="fill_parent"
diff --git a/res/layout/account_setup_incoming.xml b/res/layout/account_setup_incoming.xml
index 9b506929d..eb6041eb9 100644
--- a/res/layout/account_setup_incoming.xml
+++ b/res/layout/account_setup_incoming.xml
@@ -3,6 +3,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
+    
+    android:padding="6dip"
     android:scrollbarStyle="outsideInset">
     <LinearLayout
         android:layout_width="fill_parent"
@@ -162,7 +164,7 @@
         <RelativeLayout
             android:layout_width="fill_parent"
             android:layout_height="54px"
-            android:background="@drawable/bottombar_565">
+            >
             <Button
                 android:id="@+id/next"
                 android:text="@string/next_action"
diff --git a/res/layout/account_setup_names.xml b/res/layout/account_setup_names.xml
index 139f34667..e86535338 100644
--- a/res/layout/account_setup_names.xml
+++ b/res/layout/account_setup_names.xml
@@ -3,6 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
+    
     android:orientation="vertical">
     <TextView
         android:text="@string/account_setup_names_instructions"
@@ -39,7 +40,7 @@
     <RelativeLayout
         android:layout_width="fill_parent"
         android:layout_height="54px"
-        android:background="@drawable/bottombar_565">
+        >
         <Button
             android:id="@+id/done"
             android:text="@string/done_action"
diff --git a/res/layout/account_setup_options.xml b/res/layout/account_setup_options.xml
index 8061e39d3..4c7843c91 100644
--- a/res/layout/account_setup_options.xml
+++ b/res/layout/account_setup_options.xml
@@ -3,6 +3,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
+    android:padding="6dip"
+    
     android:scrollbarStyle="outsideInset">
     <LinearLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
@@ -14,7 +16,8 @@
             android:layout_height="wrap_content"
             android:layout_width="fill_parent"
             android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="?android:attr/textColorPrimary" />
+            android:textColor="?android:attr/textColorPrimary"
+           />
         <Spinner
             android:id="@+id/account_check_frequency"
             android:layout_height="wrap_content"
@@ -33,16 +36,20 @@
             android:id="@+id/account_default"
             android:layout_height="wrap_content"
             android:layout_width="fill_parent"
+            android:textColor="?android:attr/textColorPrimary"
             android:text="@string/account_setup_options_default_label" />
         <CheckBox
             android:id="@+id/account_notify"
             android:layout_height="wrap_content"
             android:layout_width="fill_parent"
+            android:textColor="?android:attr/textColorPrimary"
             android:text="@string/account_setup_options_notify_label" />
         <CheckBox
             android:id="@+id/account_notify_sync"
             android:layout_height="wrap_content"
             android:layout_width="fill_parent"
+            android:textColor="?android:attr/textColorPrimary"
+
             android:text="@string/account_setup_options_notify_sync_label" />
         <View
             android:layout_width="fill_parent"
@@ -52,7 +59,7 @@
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"
             android:gravity="bottom|right"
-            android:background="@drawable/bottombar_565">
+            >
             <Button
                 android:id="@+id/next"
                 android:text="@string/next_action"
diff --git a/res/layout/account_setup_outgoing.xml b/res/layout/account_setup_outgoing.xml
index b17a49c5d..3f0a472a5 100644
--- a/res/layout/account_setup_outgoing.xml
+++ b/res/layout/account_setup_outgoing.xml
@@ -3,6 +3,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
+    
+    android:padding="6dip"
     android:scrollbarStyle="outsideInset">
     <LinearLayout
         android:layout_width="fill_parent"
@@ -82,7 +84,7 @@
         <RelativeLayout
             android:layout_width="fill_parent"
             android:layout_height="54px"
-            android:background="@drawable/bottombar_565">
+            >
             <Button
                 android:id="@+id/next"
                 android:text="@string/next_action"
diff --git a/res/layout/accounts.xml b/res/layout/accounts.xml
index 5e5ede108..c4db30419 100644
--- a/res/layout/accounts.xml
+++ b/res/layout/accounts.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">
     <ListView
@@ -23,7 +24,9 @@
                 android:layout_height="wrap_content"
                 android:textSize="14sp"
                 android:text="@string/accounts_welcome"
-                android:textColor="?android:attr/textColorPrimary" />
+                android:textColor="?android:attr/textColorPrimary"
+                android:padding="8dip"
+                />
             <View
                 android:layout_width="fill_parent"
                 android:layout_height="0px"
@@ -32,7 +35,7 @@
                 android:layout_width="fill_parent"
                 android:layout_height="54px"
                 android:gravity="bottom|right"
-                android:background="@drawable/bottombar_565">
+                >
                 <Button
                     android:id="@+id/add_new_account"
                     android:layout_width="wrap_content"
diff --git a/res/layout/accounts_item.xml b/res/layout/accounts_item.xml
index aa625d79a..391c075dc 100644
--- a/res/layout/accounts_item.xml
+++ b/res/layout/accounts_item.xml
@@ -5,6 +5,7 @@
     android:layout_height="?android:attr/listPreferredItemHeight"
     android:orientation="horizontal"
     android:gravity="center_vertical"
+    
     android:paddingRight="4px">
     <LinearLayout
         android:layout_width="wrap_content"
diff --git a/res/layout/folder_message_list_child.xml b/res/layout/folder_message_list_child.xml
index b2d0f0d62..d1ae3f9ca 100644
--- a/res/layout/folder_message_list_child.xml
+++ b/res/layout/folder_message_list_child.xml
@@ -5,7 +5,8 @@
     android:layout_height="38px"
     android:paddingRight="1px"
     android:paddingTop="2px"
-    android:background="@drawable/folder_message_list_child_background">
+    android:background="@drawable/folder_message_list_child_background"
+    >
     <View
         android:id="@+id/chip"
         android:background="@drawable/appointment_indicator_leftside_1"
diff --git a/res/layout/folder_message_list_child_footer.xml b/res/layout/folder_message_list_child_footer.xml
index 0e4bb5e26..82a522f4d 100644
--- a/res/layout/folder_message_list_child_footer.xml
+++ b/res/layout/folder_message_list_child_footer.xml
@@ -3,6 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="?android:attr/listPreferredItemHeight"
+    android:background="@drawable/folder_message_list_child_footer_background"
     android:gravity="center"
     android:orientation="horizontal">
     <ProgressBar
diff --git a/res/layout/folder_message_list_group.xml b/res/layout/folder_message_list_group.xml
index 36706d466..ba388255b 100644
--- a/res/layout/folder_message_list_group.xml
+++ b/res/layout/folder_message_list_group.xml
@@ -5,6 +5,8 @@
     android:layout_height="?android:attr/listPreferredItemHeight"
     android:orientation="horizontal"
     android:gravity="center_vertical"
+    android:background="@drawable/folder_message_list_group_background"
+    
     android:paddingLeft="36px"
     android:paddingRight="4px">
     <LinearLayout
diff --git a/res/layout/message_compose.xml b/res/layout/message_compose.xml
index e5fd3e552..acb7f4363 100644
--- a/res/layout/message_compose.xml
+++ b/res/layout/message_compose.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="fill_parent" android:layout_width="fill_parent"
-    android:orientation="vertical" android:background="#ffffff">
+    android:orientation="vertical" >
     <ScrollView android:layout_width="fill_parent"
         android:layout_height="0dip" android:layout_weight="1"
         android:scrollbarStyle="outsideInset"
@@ -15,7 +15,7 @@
                     android:id="@+id/to" android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:textColor="?android:attr/textColorSecondaryInverse"
+                    android:textColor="?android:attr/textColorSecondary"
                     android:layout_marginLeft="6px"
                     android:layout_marginRight="6px"
                     android:hint="@string/message_compose_to_hint" />
@@ -23,7 +23,7 @@
                     android:id="@+id/cc" android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:textColor="?android:attr/textColorSecondaryInverse"
+                    android:textColor="?android:attr/textColorSecondary"
                     android:layout_marginLeft="6px"
                     android:layout_marginRight="6px"
                     android:hint="@string/message_compose_cc_hint"
@@ -32,7 +32,7 @@
                     android:id="@+id/bcc" android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:textColor="?android:attr/textColorSecondaryInverse"
+                    android:textColor="?android:attr/textColorSecondary"
                     android:layout_marginLeft="6px"
                     android:layout_marginRight="6px"
                     android:hint="@string/message_compose_bcc_hint"
@@ -42,7 +42,7 @@
                     android:singleLine="true"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:layout_height="wrap_content"
-                    android:textColor="?android:attr/textColorSecondaryInverse"
+                    android:textColor="?android:attr/textColorSecondary"
                     android:layout_marginLeft="6px"
                     android:layout_marginRight="6px"
                     android:hint="@string/message_compose_subject_hint"
@@ -60,7 +60,7 @@
                     android:background="@drawable/divider_horizontal_email" />
             </LinearLayout>
             <EditText android:id="@+id/message_content"
-                android:textColor="?android:attr/textColorSecondaryInverse"
+                android:textColor="?android:attr/textColorSecondary"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1.0"
@@ -75,7 +75,7 @@
                 <TextView android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:textColor="?android:attr/textColorSecondaryInverse"
+                    android:textColor="?android:attr/textColorSecondary"
                     android:text="@string/message_compose_quoted_text_label"
                     android:layout_alignParentLeft="true"
                     android:layout_centerVertical="true" />
diff --git a/res/layout/message_compose_attachment.xml b/res/layout/message_compose_attachment.xml
index 3ce5dcb55..3de821537 100644
--- a/res/layout/message_compose_attachment.xml
+++ b/res/layout/message_compose_attachment.xml
@@ -15,7 +15,7 @@
 	<TextView
 		android:id="@+id/attachment_name"
 		android:textAppearance="?android:attr/textAppearanceMedium"
-		android:textColor="?android:attr/textColorSecondaryInverse"
+		android:textColor="?android:attr/textColorSecondary"
 		android:layout_width="1dip"
 		android:layout_height="42px"
 		android:background="@drawable/text_box"
diff --git a/res/layout/message_view_attachment.xml b/res/layout/message_view_attachment.xml
index acc865266..49d7aaef5 100644
--- a/res/layout/message_view_attachment.xml
+++ b/res/layout/message_view_attachment.xml
@@ -27,7 +27,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textColor="?android:attr/textColorSecondaryInverse"
+                android:textColor="?android:attr/textColorSecondary"
                 android:singleLine="true"
                 android:ellipsize="middle"
                 android:layout_alignParentTop="true"
@@ -39,7 +39,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="?android:attr/textColorTertiaryInverse"
+                android:textColor="?android:attr/textColorTertiary"
                 android:singleLine="true"
                 android:ellipsize="middle"
                 android:layout_alignLeft="@id/attachment_name"
diff --git a/res/layout/message_view_header.xml b/res/layout/message_view_header.xml
index 95658f6e1..801a2318c 100644
--- a/res/layout/message_view_header.xml
+++ b/res/layout/message_view_header.xml
@@ -9,7 +9,7 @@
         <TextView
             android:id="@+id/from"
             android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="?android:attr/textColorPrimaryInverse"
+            android:textColor="?android:attr/textColorPrimary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentLeft="true"
@@ -33,7 +33,7 @@
             <TextView
                 android:id="@+id/to_label"
                 android:textSize="10sp"
-                android:textColor="?android:attr/textColorSecondaryInverse"
+                android:textColor="?android:attr/textColorSecondary"
                 android:textStyle="bold"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -41,7 +41,7 @@
             <TextView
                 android:id="@+id/to"
                 android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="?android:attr/textColorSecondaryInverse"
+                android:textColor="?android:attr/textColorSecondary"
                 android:textSize="10sp"
                 android:layout_width="0dip"
                 android:layout_weight="1.0"
@@ -52,7 +52,7 @@
            <TextView
                 android:id="@+id/date"
                 android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="?android:attr/textColorPrimaryInverse"
+                android:textColor="?android:attr/textColorPrimary"
                 android:layout_width="wrap_content"
                 android:layout_alignParentTop="true"
                 android:layout_alignParentRight="true"
@@ -67,7 +67,7 @@
             <TextView
                 android:id="@+id/subject"
                 android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="?android:attr/textColorSecondaryInverse"
+                android:textColor="?android:attr/textColorSecondary"
                 android:textSize="10sp"
                 android:textStyle="bold"
                 android:layout_width="0dip"
@@ -89,7 +89,7 @@
         android:visibility="gone">
         <TextView
             android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="?android:attr/textColorSecondaryInverse"
+            android:textColor="?android:attr/textColorSecondary"
             android:text="@string/message_view_show_pictures_instructions"
             android:layout_gravity="center"
             android:layout_width="0dip"
@@ -106,7 +106,7 @@
         android:id="@+id/message_content"
         android:layout_height="wrap_content"
         android:layout_width="fill_parent"
-        android:background="#ffffff" />
+         />
     <!-- attachments area -->
     <LinearLayout
         android:id="@+id/attachments"
@@ -114,6 +114,6 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:padding="4dip"
-        android:background="#ffffff">
+        >
     </LinearLayout>
 </merge>
diff --git a/res/layout/recipient_dropdown_item.xml b/res/layout/recipient_dropdown_item.xml
index eeb344fb1..80888076d 100644
--- a/res/layout/recipient_dropdown_item.xml
+++ b/res/layout/recipient_dropdown_item.xml
@@ -4,7 +4,7 @@
     android:layout_height="50px"
     android:orientation="horizontal">
     <TextView android:id="@+id/text1"
-        android:textColor="?android:attr/textColorPrimaryInverse"
+        android:textColor="?android:attr/textColorPrimary"
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -15,7 +15,7 @@
         android:ellipsize="end"
         />
     <TextView android:id="@+id/text2"
-        android:textColor="?android:attr/textColorSecondaryInverse"
+        android:textColor="?android:attr/textColorSecondary"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 07cf5d9b4..5c3216e34 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<color name="folder_message_list_child_background">#3B3B3B</color>
-</resources>
\ No newline at end of file
+	<color name="folder_message_list_group_background">#cccccc</color>
+	<color name="folder_message_list_child_background">#eeeeee</color>
+    <color name="folder_message_list_child_footer_background">#ffffff</color>
+</resources>
diff --git a/src/com/android/email/activity/FolderMessageList.java b/src/com/android/email/activity/FolderMessageList.java
index 4c3f224d2..efcad1253 100644
--- a/src/com/android/email/activity/FolderMessageList.java
+++ b/src/com/android/email/activity/FolderMessageList.java
@@ -2199,10 +2199,7 @@ public class FolderMessageList extends ExpandableListActivity
                 {
                   holder.subject.setTextColor(Email.FLAGGED_COLOR);
                 }
-                else
-                {
-                  holder.subject.setTextColor(0xffffffff);
-                }
+
                 holder.subject.setText(message.subject);
                 
                 holder.from.setText(message.sender);