diff --git a/email2/res/drawable-hdpi/ic_badge_forward_holo_light.png b/email2/res/drawable-hdpi/ic_badge_forward_holo_light.png
deleted file mode 100644
index 1b2d54fa5..000000000
Binary files a/email2/res/drawable-hdpi/ic_badge_forward_holo_light.png and /dev/null differ
diff --git a/email2/res/drawable-hdpi/ic_badge_reply_forward_holo_light.png b/email2/res/drawable-hdpi/ic_badge_reply_forward_holo_light.png
deleted file mode 100644
index e89b30114..000000000
Binary files a/email2/res/drawable-hdpi/ic_badge_reply_forward_holo_light.png and /dev/null differ
diff --git a/email2/res/drawable-hdpi/ic_badge_reply_holo_light.png b/email2/res/drawable-hdpi/ic_badge_reply_holo_light.png
deleted file mode 100644
index 1c0e82288..000000000
Binary files a/email2/res/drawable-hdpi/ic_badge_reply_holo_light.png and /dev/null differ
diff --git a/email2/res/drawable-mdpi/ic_badge_forward_holo_light.png b/email2/res/drawable-mdpi/ic_badge_forward_holo_light.png
deleted file mode 100644
index 7e801b8cd..000000000
Binary files a/email2/res/drawable-mdpi/ic_badge_forward_holo_light.png and /dev/null differ
diff --git a/email2/res/drawable-mdpi/ic_badge_reply_forward_holo_light.png b/email2/res/drawable-mdpi/ic_badge_reply_forward_holo_light.png
deleted file mode 100644
index c46ba10f4..000000000
Binary files a/email2/res/drawable-mdpi/ic_badge_reply_forward_holo_light.png and /dev/null differ
diff --git a/email2/res/drawable-mdpi/ic_badge_reply_holo_light.png b/email2/res/drawable-mdpi/ic_badge_reply_holo_light.png
deleted file mode 100644
index 7a7b07b8e..000000000
Binary files a/email2/res/drawable-mdpi/ic_badge_reply_holo_light.png and /dev/null differ
diff --git a/email2/res/drawable-xhdpi/ic_badge_forward_holo_light.png b/email2/res/drawable-xhdpi/ic_badge_forward_holo_light.png
deleted file mode 100644
index 0f5a80a3d..000000000
Binary files a/email2/res/drawable-xhdpi/ic_badge_forward_holo_light.png and /dev/null differ
diff --git a/email2/res/drawable-xhdpi/ic_badge_reply_forward_holo_light.png b/email2/res/drawable-xhdpi/ic_badge_reply_forward_holo_light.png
deleted file mode 100644
index 79b07e0a4..000000000
Binary files a/email2/res/drawable-xhdpi/ic_badge_reply_forward_holo_light.png and /dev/null differ
diff --git a/email2/res/drawable-xhdpi/ic_badge_reply_holo_light.png b/email2/res/drawable-xhdpi/ic_badge_reply_holo_light.png
deleted file mode 100644
index 3f69cc412..000000000
Binary files a/email2/res/drawable-xhdpi/ic_badge_reply_holo_light.png and /dev/null differ
diff --git a/email2/res/layout/conversation_item_view_normal.xml b/email2/res/layout/conversation_item_view_normal.xml
new file mode 100644
index 000000000..3debfc428
--- /dev/null
+++ b/email2/res/layout/conversation_item_view_normal.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2011 Google Inc.
+     Licensed to 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.
+-->
+
+<!-- This layout is used as a template to create custom view CanvasConversationHeaderView
+    in normal mode. To be able to get the correct measurements, every source field should
+    be populated with data here. E.g:
+    - Text View should set text to a random long string (android:text="@string/long_string")
+    - Image View should set source to a specific asset -->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="70sp"
+    android:orientation="vertical">
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical">
+        <ImageView
+            android:id="@+id/reply_state"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/replystate_margin_top"
+            android:layout_marginLeft="@dimen/replystate_margin_left"
+            android:layout_alignParentTop="true"
+            android:src="@drawable/ic_badge_reply_holo_light"
+            />
+        <TextView
+            android:id="@+id/senders"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            style="@style/SendersStyle"
+            android:text="@string/long_string"
+            android:textSize="@dimen/senders_font_size"
+            android:lines="1"
+            android:layout_toRightOf="@id/reply_state" />
+        <LinearLayout
+            android:layout_height="wrap_content"
+            android:layout_width="@dimen/total_conversationbar_width"
+            android:layout_alignParentRight="true">
+            <TextView
+                android:id="@+id/folders"
+                android:layout_width="@dimen/max_total_folder_width"
+                android:layout_height="wrap_content"
+                android:text="@string/long_string"
+                android:textSize="@dimen/folders_font_size"
+                android:lines="1"
+                android:paddingTop="1dip"
+                android:layout_marginTop="10sp" />
+            <ImageView
+                android:id="@+id/paperclip"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/ic_attachment_holo_light"
+                android:layout_marginTop="6sp" />
+            <TextView
+                android:id="@+id/date"
+                android:layout_width="0dip"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:text="@string/long_string"
+                android:textSize="@dimen/date_font_size"
+                android:lines="1"
+                android:layout_marginRight="16dip"
+                android:layout_marginTop="10sp" />
+        </LinearLayout>
+    </RelativeLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <ImageView
+            style="@style/CheckmarkStyle"
+            android:id="@+id/checkmark"
+            android:src="@drawable/btn_check_on_normal_holo_light"/>
+        <TextView
+            android:id="@+id/subject"
+            android:layout_width="@dimen/subject_width"
+            style="@style/SubjectStyle"
+            android:text="@string/long_string"
+            android:lines="2"/>
+        <ImageView
+            android:id="@+id/star"
+            style="@style/StarStyle"
+            android:src="@drawable/btn_star_off_normal_email_holo_light" />
+    </LinearLayout>
+</LinearLayout>
diff --git a/email2/res/layout/conversation_item_view_wide.xml b/email2/res/layout/conversation_item_view_wide.xml
new file mode 100644
index 000000000..1c72ef682
--- /dev/null
+++ b/email2/res/layout/conversation_item_view_wide.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2011 Google Inc.
+     Licensed to 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.
+-->
+
+<!-- This layout is used as a template to create custom view CanvasConversationHeaderView
+    in wide mode. To be able to get the correct measurements, every source field should
+    be populated with data here. E.g:
+    - Text View should set text to a random long string (android:text="@string/long_string")
+    - Image View should set source to a specific asset -->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="64sp"
+    android:orientation="horizontal">
+    <ImageView
+        android:id="@+id/checkmark"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="16dip"
+        android:layout_marginRight="16dip"
+        android:layout_gravity="center_vertical"
+        android:src="@drawable/btn_check_on_normal_holo_light" />
+    <TextView
+        android:id="@+id/senders"
+        android:layout_width="224dip"
+        android:layout_height="wrap_content"
+        android:text="@string/long_string"
+        android:textSize="@dimen/wide_senders_font_size"
+        android:layout_gravity="center_vertical"
+        android:maxLines="2"
+        android:layout_marginTop="@dimen/wide_senders_margin_top"  />
+    <ImageView
+        android:id="@+id/reply_state"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="16dip"
+        android:layout_marginRight="16dip"
+        android:layout_gravity="center_vertical"
+        android:src="@drawable/ic_badge_reply_holo_light" />
+    <TextView
+        android:id="@+id/subject"
+        android:layout_width="0dip"
+        android:layout_weight="0.7"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:text="@string/long_string"
+        android:lines="2"
+        android:textColor="@color/subject_text_color_unread"
+        android:textSize="@dimen/wide_subject_font_size"
+        android:layout_marginTop="2sp"
+        android:layout_marginRight="@dimen/wide_subject_margin_right"/>
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+        <TextView
+            android:id="@+id/folders"
+            android:layout_width="@dimen/max_total_folder_width_wide"
+            android:layout_height="wrap_content"
+            android:paddingTop="2sp"
+            android:text="@string/long_string"
+            android:textSize="@dimen/folders_font_size"
+            android:lines="1"
+            android:layout_gravity="top" />
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:layout_gravity="center_vertical">
+            <ImageView
+                android:id="@+id/paperclip"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/ic_attachment_holo_light"
+                android:layout_gravity="center_vertical"
+                android:layout_marginTop="@dimen/wide_attachment_margin_top"/>
+            <TextView
+                android:id="@+id/date"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="@string/date"
+                android:layout_marginTop="@dimen/wide_date_margin_top" />
+        </LinearLayout>
+    </LinearLayout>
+    <ImageView
+        android:id="@+id/star"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="16dip"
+        android:layout_marginRight="16dip"
+        android:layout_gravity="center_vertical"
+        android:src="@drawable/btn_star_off_normal_email_holo_light" />
+</LinearLayout>