diff --git a/email2/res/layout-sw600dp/waiting_for_sync_message.xml b/email2/res/layout-sw600dp/waiting_for_sync_message.xml
deleted file mode 100644
index 8c98c096d..000000000
--- a/email2/res/layout-sw600dp/waiting_for_sync_message.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/waiting_for_sync_message"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:padding="16dip"
-    >
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:textSize="32dip"
-        android:text="@string/waitinf_for_sync_message_1"
-        />
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:layout_marginTop="32dip"
-        android:textSize="20dip"
-        android:text="@string/waitinf_for_sync_message_2"
-        />
-    <ProgressBar
-        style="?android:attr/progressBarStyleLarge"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_marginTop="32dip"
-        />
-</LinearLayout>
diff --git a/email2/res/layout/conversation_item_view_normal.xml b/email2/res/layout/conversation_item_view_normal.xml
index 1bf8f6634..e0652bd87 100644
--- a/email2/res/layout/conversation_item_view_normal.xml
+++ b/email2/res/layout/conversation_item_view_normal.xml
@@ -24,7 +24,7 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="70sp"
+    android:layout_height="@dimen/conversation_item_height"
     android:orientation="vertical">
     <RelativeLayout
         android:layout_width="match_parent"
@@ -36,7 +36,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/replystate_margin_top"
             android:layout_marginLeft="@dimen/replystate_margin_left"
-            android:layout_alignParentTop="true"
+            android:layout_marginRight="@dimen/replystate_margin_right"
             android:src="@drawable/ic_badge_reply_holo_light"
             />
         <com.android.mail.browse.SendersView
diff --git a/email2/res/layout/waiting_for_sync_message.xml b/email2/res/layout/waiting_for_sync_message.xml
deleted file mode 100644
index 8d5281da0..000000000
--- a/email2/res/layout/waiting_for_sync_message.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@android:color/white"
-    android:id="@+id/waiting_for_sync_message">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:id="@+id/wait_for_sync_wrapper"
-        android:layout_marginTop="16dip"
-        android:layout_marginLeft="16dip">
-
-        <ProgressBar
-            android:indeterminate="true"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:id="@+id/progress_spinner"/>
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/waitinf_for_sync_message_1"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:id="@+id/title"
-            android:layout_toRightOf="@id/progress_spinner"
-            android:layout_marginLeft="4dip" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/waitinf_for_sync_message_2"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:layout_below="@id/title"
-            android:layout_toRightOf="@id/progress_spinner"
-            android:layout_marginLeft="4dip" />
-
-    </RelativeLayout>
-
-</RelativeLayout>
diff --git a/email2/res/values-sw600dp-land/dimensions.xml b/email2/res/values-sw600dp-land/dimensions.xml
deleted file mode 100644
index 6e71363f5..000000000
--- a/email2/res/values-sw600dp-land/dimensions.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- tablet, landscape -->
-<resources>
-
-    <!-- Account Setup Activities -->
-    <dimen name="setup_padding_top">16dip</dimen>
-    <dimen name="setup_padding_left">64dip</dimen>
-    <dimen name="setup_padding_right">64dip</dimen>
-
-</resources>
diff --git a/email2/res/values-sw600dp/bools.xml b/email2/res/values-sw600dp/bools.xml
deleted file mode 100644
index 60275191d..000000000
--- a/email2/res/values-sw600dp/bools.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <bool name="use_two_pane">true</bool>
-
-    <!-- Reply/Reply All/Forward switcher in action bar -->
-    <bool name="message_compose_action_tabs">true</bool>
-</resources>
diff --git a/email2/res/values-sw600dp/colors.xml b/email2/res/values-sw600dp/colors.xml
deleted file mode 100644
index 63d594385..000000000
--- a/email2/res/values-sw600dp/colors.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <color name="message_view_fogged_glass_color">#00000000</color>
-</resources>
diff --git a/email2/res/values-sw600dp/dimensions.xml b/email2/res/values-sw600dp/dimensions.xml
index 2ce5d05e4..e0b8a2eec 100644
--- a/email2/res/values-sw600dp/dimensions.xml
+++ b/email2/res/values-sw600dp/dimensions.xml
@@ -16,17 +16,6 @@
 
 <!-- tablet -->
 <resources>
-    <!-- Bottom padding used to compensate for the built in drop shadow in the
-         asset. -->
-    <dimen name="message_header_height">64dip</dimen>
-    <dimen name="message_header_bottom_padding">4dip</dimen>
-    <dimen name="message_header_badge_width">64dip</dimen>
-    <dimen name="message_header_name_margin">16dip</dimen>
-
-    <!-- hack around the fact that the checkbox below the reply state has a lot
-         of padding built into the asset -->
-    <dimen name="message_list_icon_padding_compensation">-6dip</dimen>
-
     <!-- Account Setup Activities -->
     <!-- inset distance for setup/settings buttons -->
     <dimen name="setup_buttons_padding_left">16dip</dimen>
@@ -53,14 +42,14 @@
     <dimen name="setup_item_inset_left">16dip</dimen>
     <dimen name="setup_item_inset_right">64dip</dimen>
 
-    <!-- Folder list items -->
-    <dimen name="mailbox_list_padding_left">16dip</dimen>
-    <dimen name="mailbox_list_padding_right">24dip</dimen>
-    <dimen name="mailbox_list_count_margin_left">16dip</dimen>
+    <!-- Account Setup Activities -->
+    <dimen name="setup_padding_top">16dip</dimen>
+    <dimen name="setup_padding_left">64dip</dimen>
+    <dimen name="setup_padding_right">64dip</dimen>
 
-    <!-- Message list items -->
-    <dimen name="replystate_margin_left">8dip</dimen>
-    <dimen name="replystate_margin_top">3sp</dimen>
-    <dimen name="checkmark_margin_top">4sp</dimen>
+    <!-- Message list items -->            
+    <dimen name="replystate_margin_top">3sp</dimen>   
+    <dimen name="replystate_margin_right">16dip</dimen>  
+    <dimen name="checkmark_margin_top">4sp</dimen>      
     <dimen name="star_margin_top">30sp</dimen>
 </resources>
diff --git a/email2/res/values-sw600dp/styles.xml b/email2/res/values-sw600dp/styles.xml
index 37ae1eab7..08c573fff 100644
--- a/email2/res/values-sw600dp/styles.xml
+++ b/email2/res/values-sw600dp/styles.xml
@@ -57,10 +57,4 @@
         <item name="android:layout_toRightOf">@+id/main_content"</item>
         <item name="android:layout_alignParentRight">true</item>
     </style>
-
-    <style name="SendersStyle">
-        <item name="android:layout_marginLeft">8dip</item>
-        <item name="android:layout_marginTop">10sp</item>
-    </style>
-
 </resources>
diff --git a/email2/res/values-sw800dp-land/dimen.xml b/email2/res/values-sw720dp-land/dimensions.xml
similarity index 100%
rename from email2/res/values-sw800dp-land/dimen.xml
rename to email2/res/values-sw720dp-land/dimensions.xml
diff --git a/email2/res/values/bools.xml b/email2/res/values/bools.xml
deleted file mode 100644
index 4a6977b07..000000000
--- a/email2/res/values/bools.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <bool name="use_two_pane">false</bool>
-
-    <!-- Reply/Reply All/Forward switcher in action bar -->
-    <bool name="message_compose_action_tabs">false</bool>
-</resources>
diff --git a/email2/res/values/colors.xml b/email2/res/values/colors.xml
index f00f37eaf..a50494161 100644
--- a/email2/res/values/colors.xml
+++ b/email2/res/values/colors.xml
@@ -14,6 +14,7 @@
      limitations under the License.
 -->
 
+<!-- See also values-xlarge for specializations for xlarge screens -->
 <!-- See also values-xlarge for specializations for xlarge screens -->
 <resources>
     <!-- Account setup screens -->
@@ -23,25 +24,11 @@
     <color name="account_setup_divider_color">#CCCCCC</color>
 
     <!-- Main UI -->
-    <color name="message_list_item_background_unread">#404040</color>
-    <color name="message_list_item_background_read">#000000</color>
-    <color name="account_folder_list_item_separator">#303030</color>
     <color name="connection_error_banner">#fffff1a8</color>
 
     <!-- Standard text colors -->
-    <color name="text_primary_color">#000000</color>
     <color name="text_secondary_color">#666666</color>
     <color name="text_ternary_color">#aaaaaa</color>
-    <color name="text_disabled_color">#888888</color>
-
-    <color name="button_text_color">#777777</color>
-    <color name="button_text_disabled_color">#cccccc</color>
-
-    <!-- TODO: properly put these text colors in the theme and use selectors -->
-    <color name="text_primary_color_inverse">#ffffff</color>
-    <color name="text_secondary_color_inverse">#eeeeee</color>
-
-    <color name="divider_color">#ff808080</color>
 
     <!-- Account color chips on combined view -->
     <color name="combined_view_account_color_1">#ff71aea7</color>
@@ -54,23 +41,6 @@
     <color name="combined_view_account_color_8">#ff738359</color>
     <color name="combined_view_account_color_9">#ff9d50a4</color>
 
-    <!-- Drop target colors -->
-    <color name="mailbox_drop_unavailable_fg_color">#ff999999</color>
-    <color name="mailbox_drop_available_bg_color">#00ffffff</color>
-    <color name="mailbox_drop_destructive_bg_color">#fff10000</color>
-
-    <!--  Widget colors -->
-    <color name="widget_default_text_color">#ff000000</color>
-    <color name="widget_light_text_color">#ff666666</color>
-    <color name="widget_title_color">#333333</color>
-    <color name="widget_unread_color">#777777</color>
-
-    <color name="message_view_info_back_color">#deecfa</color>
-    <color name="message_view_header_color">#3cb8e6</color>
-    <color name="message_activated_color">#3cb8e6</color>
-
-    <color name="error_bar_background">#ffff66</color>
-
-    <!-- Compose colors -->
-    <color name="compose_label_text">#aaaaaa</color>
-</resources>
+    <color name="button_text_color">#777777</color>
+    <color name="button_text_disabled_color">#cccccc</color>
+</resources>
\ No newline at end of file
diff --git a/email2/res/values/dimensions.xml b/email2/res/values/dimensions.xml
index f20bd9fd5..a466dd309 100644
--- a/email2/res/values/dimensions.xml
+++ b/email2/res/values/dimensions.xml
@@ -25,24 +25,6 @@
     <dimen name="message_list_badge_margin">4dip</dimen>
     <dimen name="message_list_icon_padding_compensation">3dip</dimen>
 
-    <dimen name="message_header_height">48dip</dimen>
-    <dimen name="message_header_badge_width">48dip</dimen>
-    <dimen name="message_header_name_margin">4dip</dimen>
-
-    <dimen name="error_message_height">48dip</dimen>
-
-    <dimen name="widget_senders_font_size">14sp</dimen>
-    <dimen name="widget_subject_font_size">14sp</dimen>
-    <dimen name="widget_date_font_size">14sp</dimen>
-
-    <dimen name="message_list_drag_offset">16dip</dimen>
-    <dimen name="message_list_drag_count_font_size">42sp</dimen>
-    <dimen name="message_list_drag_count_left_margin">16dip</dimen>
-    <dimen name="message_list_drag_message_font_size">18sp</dimen>
-    <dimen name="message_list_drag_message_right_margin">16dip</dimen>
-
-    <dimen name="compose_scrollview_width">700dip</dimen>
-
     <!-- Account settings fragments -->
     <dimen name="settings_fragment_padding_top">16dip</dimen>
     <dimen name="settings_fragment_padding_left">16dip</dimen>
@@ -61,21 +43,11 @@
     <dimen name="setup_item_inset_left">0dip</dimen>
     <dimen name="setup_item_inset_right">0dip</dimen>
 
-    <!-- MessageListItem -->
-    <dimen name="minimum_width_wide_mode">720dip</dimen>
-
     <!-- Username/password entry -->
     <dimen name="setup_credentials_input_width">340dip</dimen>
 
-    <!-- Folder list item -->
-    <dimen name="mailbox_list_padding_left">8dip</dimen>
-    <dimen name="mailbox_list_padding_right">16dip</dimen>
-    <dimen name="mailbox_list_count_margin_left">8dip</dimen>
-
     <!-- Message list items -->
     <dimen name="replystate_margin_left">8dip</dimen>
+    <dimen name="replystate_margin_right">0dip</dimen>
     <dimen name="replystate_margin_top">10sp</dimen>
-    <dimen name="checkmark_margin_top">3sp</dimen>
-    <dimen name="star_margin_top">28sp</dimen>
-    <dimen name="date_margin_top">9sp</dimen>
 </resources>
diff --git a/email2/res/values/styles.xml b/email2/res/values/styles.xml
index c3f46d516..956a86cff 100644
--- a/email2/res/values/styles.xml
+++ b/email2/res/values/styles.xml
@@ -45,14 +45,5 @@
         <item name="android:textColor">?android:attr/textColorPrimary</item>
         <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
     </style>
-
-    <style name="notification_secondary_text">
-        <item name="android:textColor">?android:attr/textColorSecondary</item>
-    </style>
-
-    <style name="SendersStyle">
-        <item name="android:layout_marginLeft">8dip</item>
-        <item name="android:layout_marginTop">8sp</item>
-    </style>
 </resources>
 
diff --git a/email2/src/com/android/email/activity/UiUtilities.java b/email2/src/com/android/email/activity/UiUtilities.java
index c76ed4107..de853d31a 100644
--- a/email2/src/com/android/email/activity/UiUtilities.java
+++ b/email2/src/com/android/email/activity/UiUtilities.java
@@ -135,17 +135,4 @@ public class UiUtilities {
     static void setDebugPaneMode(int paneMode) {
         sDebugForcedPaneMode = paneMode;
     }
-
-    /**
-     * @return {@code true} if 2-pane UI should be used.  {@code false} otherwise.
-     */
-    public static boolean useTwoPane(Context context) {
-        if (sDebugForcedPaneMode == 1) {
-            return false;
-        }
-        if (sDebugForcedPaneMode == 2) {
-            return true;
-        }
-        return context.getResources().getBoolean(R.bool.use_two_pane);
-    }
 }