Message header ui update. b/15595931

Change-Id: Ic3ce06409707e326e4dc2eef6bb8617f5f03d1b8
diff --git a/res/drawable-hdpi/ic_menu_expander_maximized_holo_light.png b/res/drawable-hdpi/ic_menu_expander_maximized_holo_light.png
deleted file mode 100644
index 924e8bb..0000000
--- a/res/drawable-hdpi/ic_menu_expander_maximized_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_expander_minimized_holo_light.png b/res/drawable-hdpi/ic_menu_expander_minimized_holo_light.png
deleted file mode 100644
index de78288..0000000
--- a/res/drawable-hdpi/ic_menu_expander_minimized_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_expander_maximized_holo_light.png b/res/drawable-mdpi/ic_menu_expander_maximized_holo_light.png
deleted file mode 100644
index e2a2dfd..0000000
--- a/res/drawable-mdpi/ic_menu_expander_maximized_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_expander_minimized_holo_light.png b/res/drawable-mdpi/ic_menu_expander_minimized_holo_light.png
deleted file mode 100644
index 7eed231..0000000
--- a/res/drawable-mdpi/ic_menu_expander_minimized_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_expander_maximized_holo_light.png b/res/drawable-xhdpi/ic_menu_expander_maximized_holo_light.png
deleted file mode 100644
index b174cf8..0000000
--- a/res/drawable-xhdpi/ic_menu_expander_maximized_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_expander_minimized_holo_light.png b/res/drawable-xhdpi/ic_menu_expander_minimized_holo_light.png
deleted file mode 100644
index fab561e..0000000
--- a/res/drawable-xhdpi/ic_menu_expander_minimized_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_menu_expander_maximized_holo_light.png b/res/drawable-xxhdpi/ic_menu_expander_maximized_holo_light.png
deleted file mode 100644
index a42aec2..0000000
--- a/res/drawable-xxhdpi/ic_menu_expander_maximized_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_menu_expander_minimized_holo_light.png b/res/drawable-xxhdpi/ic_menu_expander_minimized_holo_light.png
deleted file mode 100644
index 1ca2e46..0000000
--- a/res/drawable-xxhdpi/ic_menu_expander_minimized_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/layout/conversation_message_details_header.xml b/res/layout/conversation_message_details_header.xml
deleted file mode 100644
index 0a4fad8..0000000
--- a/res/layout/conversation_message_details_header.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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.
--->
-<GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/details_collapsed_content"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?android:attr/selectableItemBackground"
-    android:paddingBottom="@dimen/message_details_header_vertical_padding"
-    style="@style/MessageDetailsHeaderStyle" >
-    <TextView
-        android:id="@+id/recipients_summary"
-        android:layout_width="0dp"
-        android:layout_gravity="fill_horizontal"
-        android:singleLine="true"
-        android:bufferType="spannable"
-        style="@style/RecipientSummaryStyle" />
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:contentDescription="@string/expand_recipient_details"
-        android:src="@drawable/ic_menu_expander_minimized_holo_light" />
-</GridLayout>
diff --git a/res/layout/conversation_message_footer.xml b/res/layout/conversation_message_footer.xml
index 6080b4e..c257590 100644
--- a/res/layout/conversation_message_footer.xml
+++ b/res/layout/conversation_message_footer.xml
@@ -33,7 +33,7 @@
         android:paddingLeft="@dimen/conversation_message_content_margin_side"
         android:paddingRight="@dimen/conversation_message_content_margin_side"
         android:text="@string/view_entire_message"
-        android:textColor="@color/conv_header_text_link_blue"
+        android:textColor="@color/conversation_view_text_color_link_blue"
         android:textSize="14sp"
         android:visibility="gone" />
 
diff --git a/res/layout/conversation_message_header.xml b/res/layout/conversation_message_header.xml
index 4d1ddd8..e741d25 100644
--- a/res/layout/conversation_message_header.xml
+++ b/res/layout/conversation_message_header.xml
@@ -34,8 +34,7 @@
                   android:layout_width="match_parent"
                   android:layout_height="wrap_content"
                   android:background="@color/message_header_background_color"
-                  android:orientation="vertical"
-                  style="@style/ConversationViewMarginStyle"/>
+                  android:orientation="vertical" />
 
     <View android:id="@+id/snap_header_bottom_border"
           android:layout_width="match_parent"
diff --git a/res/layout/conversation_message_details_header_expanded.xml b/res/layout/conversation_message_header_details.xml
similarity index 92%
rename from res/layout/conversation_message_details_header_expanded.xml
rename to res/layout/conversation_message_header_details.xml
index 5e0182c..31d0e26 100644
--- a/res/layout/conversation_message_details_header_expanded.xml
+++ b/res/layout/conversation_message_header_details.xml
@@ -21,7 +21,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?android:attr/selectableItemBackground"
-    app:columnCount="3"
+    app:columnCount="2"
     app:rowCount="6"
     style="@style/MessageDetailsHeaderStyle" >
 
@@ -46,15 +46,6 @@
         app:layout_row="0"
         android:visibility="gone"
         style="@style/MessageDetailsValueStyle" />
-    <ImageView
-        android:id="@+id/details_expander"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_column="2"
-        app:layout_row="0"
-        android:contentDescription="@string/collapse_recipient_details"
-        android:src="@drawable/ic_menu_expander_maximized_holo_light"
-        style="@style/DetailsExpanderStyle" />
     <TextView
         android:id="@+id/replyto_heading"
         android:layout_width="wrap_content"
@@ -83,7 +74,7 @@
         android:focusable="true"
         app:layout_column="0"
         app:layout_row="2"
-        android:text="@string/to_heading"
+        android:text="@string/to_heading_no_space"
         android:visibility="gone"
         style="@style/MessageHeaderDetailsHeadingStyle" />
     <TextView
diff --git a/res/layout/conversation_message_upper_header.xml b/res/layout/conversation_message_upper_header.xml
index 0ca6507..56722bc 100644
--- a/res/layout/conversation_message_upper_header.xml
+++ b/res/layout/conversation_message_upper_header.xml
@@ -19,31 +19,29 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@color/message_header_background_color"
-    android:duplicateParentState="true"
-    style="@style/ConversationViewMarginStyle" >
+    android:duplicateParentState="true" >
 
     <com.android.mail.browse.MessageHeaderContactBadge
         android:id="@+id/photo"
         android:layout_width="@dimen/message_header_contact_photo_width"
         android:layout_height="@dimen/message_header_contact_photo_height"
-        android:layout_gravity="center_vertical"
-        android:layout_marginTop="12dp"
-        android:layout_marginBottom="12dp"
+        android:layout_marginTop="@dimen/message_header_contact_photo_margin"
+        android:layout_marginBottom="@dimen/message_header_contact_photo_margin"
+        android:background="?android:attr/selectableItemBackground"
         android:scaleType="centerCrop"
         android:contentDescription="@string/contact_info_string"
-        style="@style/MessageHeaderContactImageStyle" />
+        style="@style/ConversationViewMarginStyle" />
     <!-- draft should match photo in dimensions -->
     <ImageView
         android:id="@+id/draft"
         android:layout_width="@dimen/message_header_contact_photo_width"
         android:layout_height="@dimen/message_header_contact_photo_height"
-        android:layout_gravity="center_vertical"
-        android:layout_marginTop="12dp"
-        android:layout_marginBottom="12dp"
+        android:layout_marginTop="@dimen/message_header_contact_photo_margin"
+        android:layout_marginBottom="@dimen/message_header_contact_photo_margin"
         android:visibility="gone"
         android:scaleType="center"
         android:src="@drawable/ic_draft"
-        style="@style/MessageHeaderContactImageStyle" />
+        style="@style/ConversationViewMarginStyle" />
     <include layout="@layout/conversation_message_upper_header_text" />
     <include layout="@layout/conversation_message_upper_header_actions" />
 
diff --git a/res/layout/conversation_message_upper_header_text.xml b/res/layout/conversation_message_upper_header_text.xml
index 2a6ea08..63f261e 100644
--- a/res/layout/conversation_message_upper_header_text.xml
+++ b/res/layout/conversation_message_upper_header_text.xml
@@ -24,13 +24,14 @@
     android:layout_width="0dip"
     android:layout_height="wrap_content"
     android:layout_weight="1"
-    android:layout_marginTop="12dp"
+    android:layout_marginTop="14dp"
     style="@style/MessageUpperHeaderTextStyle" >
 
     <TextView
         android:id="@+id/upper_date"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_alignBaseline="@+id/sender_name"
         android:visibility="gone"
         android:lines="1"
         style="@style/MessageHeaderUpperDateStyle" />
@@ -38,19 +39,20 @@
         android:id="@+id/attachment"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginTop="6dp"
         android:layout_toStartOf="@id/upper_date"
         android:layout_toLeftOf="@id/upper_date"
         android:src="@drawable/ic_attach_file_20dp"
         style="@style/AttachmentIconStyle" />
     <TextView
-        android:id="@+id/sender_name"
+        android:id="@id/sender_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_toStartOf="@id/attachment"
         android:layout_toLeftOf="@id/attachment"
         style="@style/MessageSenderNameStyle" />
     <TextView
-        android:id="@+id/sender_email"
+        android:id="@+id/recipient_summary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@id/sender_name"
@@ -59,12 +61,26 @@
         android:id="@+id/send_date"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@id/sender_email"
+        android:layout_below="@id/recipient_summary"
+        android:background="?android:attr/selectableItemBackground"
+        android:paddingBottom="@dimen/message_header_margin_bottom"
+        style="@style/MessageHeaderSubtitleStyle" />
+    <TextView
+        android:id="@+id/hide_details"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/recipient_summary"
+        android:background="?android:attr/selectableItemBackground"
+        android:paddingBottom="@dimen/message_header_margin_bottom"
+        android:text="@string/hide_details"
+        android:textColor="@color/conversation_view_text_color_link_blue"
+        android:visibility="gone"
         style="@style/MessageHeaderSubtitleStyle" />
     <TextView
         android:id="@+id/email_snippet"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/message_header_margin_bottom"
         android:layout_below="@id/sender_name"
         style="@style/MessageHeaderSnippetStyle" />
 </RelativeLayout>
diff --git a/res/layout/super_collapsed_block.xml b/res/layout/super_collapsed_block.xml
index 444f941..37eb1a1 100644
--- a/res/layout/super_collapsed_block.xml
+++ b/res/layout/super_collapsed_block.xml
@@ -34,7 +34,6 @@
         android:layout_height="@dimen/super_collapsed_height"
         android:gravity="center"
         android:textSize="@dimen/super_collapsed_text_size"
-        android:textColor="@color/dark_gray_text_color"
-        style="@style/ConversationViewMarginStyle" />
+        android:textColor="@color/dark_gray_text_color" />
 
 </com.android.mail.browse.SuperCollapsedBlock>
diff --git a/res/values-ldrtl/styles-ldrtl.xml b/res/values-ldrtl/styles-ldrtl.xml
index dd0432f..0196f29 100644
--- a/res/values-ldrtl/styles-ldrtl.xml
+++ b/res/values-ldrtl/styles-ldrtl.xml
@@ -23,8 +23,7 @@
     </style>
 
     <style name="MessageDetailsHeaderStyle">
-        <item name="android:paddingStart">@dimen/message_details_header_padding_start_collapsed
-        </item>
+        <item name="android:paddingStart">@dimen/message_details_header_padding_start_expanded</item>
         <item name="android:paddingEnd">@dimen/message_details_header_padding_end</item>
     </style>
 
@@ -33,8 +32,7 @@
     </style>
 
     <style name="MessageHeaderShowPicsStyle" parent="AbstractMessageHeaderShowPicsStyle">
-        <item name="android:paddingStart">@dimen/message_details_header_padding_start_collapsed
-        </item>
+        <item name="android:paddingStart">@dimen/message_details_header_padding_start_expanded</item>
         <item name="android:paddingEnd">@dimen/message_show_pics_header_padding_end</item>
         <item name="android:drawableStart">@drawable/ic_show_images_holo_light</item>
     </style>
@@ -69,7 +67,6 @@
 
     <style name="ConversationViewMarginStyle">
         <item name="android:layout_marginStart">@dimen/conversation_view_margin_side</item>
-        <item name="android:layout_marginEnd">@dimen/conversation_view_margin_side</item>
     </style>
 
     <style name="NewMessageButtonStyle" parent="AbstractNewMessageButtonStyle">
@@ -98,10 +95,6 @@
         <item name="android:layout_marginStart">@dimen/teaser_text_padding</item>
     </style>
 
-    <style name="DetailsExpanderStyle">
-        <item name="android:layout_marginStart">@dimen/message_header_inner_side_padding</item>
-    </style>
-
     <style name="MessageHeaderDetailsHeadingStyle" parent="MessageHeaderSmallStyle">
         <item name="android:layout_marginEnd">@dimen/message_header_inner_side_padding</item>
     </style>
@@ -111,10 +104,6 @@
         <item name="android:layout_marginEnd">@dimen/attachment_margin_side</item>
     </style>
 
-    <style name="MessageHeaderContactImageStyle">
-        <item name="android:layout_marginStart">@dimen/message_header_padding_start</item>
-    </style>
-
     <style name="AttachmentIconStyle">
         <item name="android:layout_marginStart">@dimen/attachment_icon_padding</item>
     </style>
@@ -132,10 +121,6 @@
         <item name="android:layout_marginEnd">@dimen/folder_list_item_end_margin</item>
     </style>
 
-    <style name="RecipientSummaryStyle" parent="MessageHeaderSmallStyle">
-        <item name="android:layout_marginEnd">@dimen/recipient_summary_margin</item>
-    </style>
-
     <style name="AttachmentTextContainer">
         <item name="android:paddingStart">@dimen/compose_attachment_text_padding</item>
     </style>
@@ -237,8 +222,9 @@
         <item name="android:layout_alignParentStart">true</item>
     </style>
 
-    <style name="MessageHeaderUpperDateStyle" parent="AbstractMessageHeaderUpperDateStyle">
+    <style name="MessageHeaderUpperDateStyle" parent="MessageHeaderSmallStyle">
         <item name="android:layout_alignParentEnd">true</item>
+        <item name="android:layout_marginStart">@dimen/attachment_icon_padding</item>
     </style>
 
     <style name="FolderParentIconStyle">
diff --git a/res/values-sw600dp/dimen.xml b/res/values-sw600dp/dimen.xml
index aacdee2..e8724e7 100644
--- a/res/values-sw600dp/dimen.xml
+++ b/res/values-sw600dp/dimen.xml
@@ -20,14 +20,13 @@
     <dimen name="conversation_header_margin_side">15dp</dimen>
     <dimen name="conversation_header_font_size">24sp</dimen>
     <dimen name="conversation_header_padding_side">24dp</dimen>
-    <dimen name="conversation_message_content_margin_side">24dp</dimen>
     <dimen name="conversation_page_gutter">0dip</dimen>
     <dimen name="message_header_inner_side_padding">16dp</dimen>
     <dimen name="message_header_contact_photo_width">64dp</dimen>
     <dimen name="message_header_contact_photo_height">64dp</dimen>
     <dimen name="message_header_action_button_width">56dp</dimen>
     <dimen name="message_header_action_button_height">56dp</dimen>
-    <dimen name="message_details_header_padding_start_collapsed">104dip</dimen>
+    <dimen name="message_details_header_padding_start_expanded">104dip</dimen>
     <dimen name="message_sender_name_text_size">20sp</dimen>
     <dimen name="message_header_subtitle_text_size">16sp</dimen>
     <dimen name="super_collapsed_height">39sp</dimen>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 1c9b107..99e2c64 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -64,9 +64,9 @@
     <!-- Conversation message header colors -->
     <color name="conversation_view_border_color">#cbcbcb</color>
     <color name="conversation_view_background_color">#f5f5f5</color>
-    <color name="conv_header_text_light">#a6a8ab</color>
-    <color name="conv_header_text_dark">#212121</color>
-    <color name="conv_header_text_link_blue">#35b4e3</color>
+    <color name="conversation_view_text_color_light">#757575</color>
+    <color name="conversation_view_text_color_dark">#212121</color>
+    <color name="conversation_view_text_color_link_blue">#00bfd8</color>
 
     <!-- Folder colors -->
     <color name="folder_disabled_drop_target_text_color">#999999</color>
diff --git a/res/values/dimen.xml b/res/values/dimen.xml
index 640a257..394c8cf 100644
--- a/res/values/dimen.xml
+++ b/res/values/dimen.xml
@@ -35,8 +35,8 @@
     <dimen name="folder_cell_width">32dip</dimen>
     <dimen name="folders_start_padding">8dip</dimen>
     <dimen name="conversation_page_gutter">16dp</dimen>
-    <dimen name="conversation_message_content_margin_side">10dp</dimen>
-    <dimen name="conversation_view_margin_side">8dp</dimen>
+    <dimen name="conversation_message_content_margin_side">16dp</dimen>
+    <dimen name="conversation_view_margin_side">16dp</dimen>
     <dimen name="conversation_header_margin_side">0dp</dimen>
     <dimen name="conversation_header_font_size">20sp</dimen>
     <dimen name="conversation_header_padding_side">16dp</dimen>
@@ -47,23 +47,25 @@
     <dimen name="conversation_folder_rounded_corner_radius">1dp</dimen>
     <dimen name="conversation_folder_margin_top">6dp</dimen>
     <dimen name="message_details_header_padding_start">16dip</dimen>
-    <dimen name="message_details_header_padding_start_collapsed">68dip</dimen>
-    <dimen name="message_details_header_padding_end">10dip</dimen>
+    <dimen name="message_details_header_padding_start_expanded">72dip</dimen>
+    <dimen name="message_details_header_padding_end">16dp</dimen>
     <dimen name="message_details_header_vertical_padding">7dp</dimen>
+    <dimen name="message_details_header_inner_side_padding">8dp</dimen>
     <dimen name="message_show_pics_header_padding_end">14dip</dimen>
     <dimen name="message_header_presence_top_margin">-4dp</dimen>
     <dimen name="message_header_action_button_width">48dp</dimen>
     <dimen name="message_header_action_button_height">48dp</dimen>
-    <dimen name="message_header_padding_start">
-        @dimen/conversation_message_content_margin_side</dimen>
     <dimen name="message_sender_name_text_size">16sp</dimen>
-    <dimen name="message_header_subtitle_text_size">12sp</dimen>
+    <dimen name="message_header_subtitle_text_size">14sp</dimen>
+    <dimen name="message_header_small_text_size">12sp</dimen>
+    <dimen name="message_header_margin_bottom">12dp</dimen>
     <dimen name="super_collapsed_height">30sp</dimen>
     <dimen name="super_collapsed_text_size">14sp</dimen>
     <dimen name="notification_view_height">36dip</dimen>
-    <dimen name="message_header_contact_photo_width">48sp</dimen>
-    <dimen name="message_header_contact_photo_height">48sp</dimen>
-    <dimen name="message_header_inner_side_padding">10dp</dimen>
+    <dimen name="message_header_contact_photo_width">40dp</dimen>
+    <dimen name="message_header_contact_photo_height">40dp</dimen>
+    <dimen name="message_header_contact_photo_margin">16dp</dimen>
+    <dimen name="message_header_inner_side_padding">16dp</dimen>
     <dimen name="attachment_toast_yoffset">-100dip</dimen>
     <dimen name="spinner_frame_width">196dip</dimen>
     <dimen name="folder_list_heading_padding_side">16dp</dimen>
@@ -93,7 +95,7 @@
     <dimen name="search_view_width">400dip</dimen>
     <dimen name="wait_padding">16dp</dimen>
     <integer name="chips_max_lines">2</integer>
-    <dimen name="tile_letter_font_size">33dp</dimen>
+    <dimen name="tile_letter_font_size">24dp</dimen>
     <dimen name="tile_letter_font_size_small">16dp</dimen>
     <dimen name="tile_divider_width">1dp</dimen>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e6ad123..bd19b07 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -465,10 +465,12 @@
     </plurals>
 
     <!-- Conversation message header strings -->
-    <!--  Icon name for expanding recipient details in a message when viewing it. [CHAR LIMIT=40] -->
-    <string name="expand_recipient_details">Expand recipient details</string>
-    <!--  Icon name for collapsing recipient details in a message when viewing it. [CHAR LIMIT=40] -->
-    <string name="collapse_recipient_details">Collapse recipient details</string>
+    <!--  Text for showing the date and expanding recipient details in a message when viewing it. [CHAR LIMIT=40] -->
+    <string name="date_and_view_details"><xliff:g id="date">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'>View details&lt;/a></string>
+    <!--  Text for collapsing recipient details in a message when viewing it. [CHAR LIMIT=40] -->
+    <string name="hide_details">Hide details</string>
+    <!-- Shown to display the recipient(s) of the message [CHAR LIMIT=10] -->
+    <string name="to_message_header">to <xliff:g id="recipients">%1$s</xliff:g></string>
     <!--  Icon name for showing sender contact information. [CHAR LIMIT=100] -->
     <string name="contact_info_string">Show contact information for <xliff:g id="name">%1$s</xliff:g></string>
     <!--  Icon name for showing sender contact information when we cannot get sender info. [CHAR LIMIT=100] -->
@@ -479,17 +481,19 @@
         <item quantity="other"><xliff:g id="count" example="4">%1$d</xliff:g> older messages</item>
     </plurals>
     <!-- Shown to display the from address of the message [CHAR LIMIT=10] -->
-    <string name="from_heading">From:\u0020</string>
+    <string name="from_heading">From:</string>
     <!-- Shown to display the reply to address of the message [CHAR LIMIT=20] -->
-    <string name="replyto_heading">Reply-to:\u0020</string>
+    <string name="replyto_heading">Reply-to:</string>
     <!-- Shown to display the to recipient(s) of the message [CHAR LIMIT=10] -->
     <string name="to_heading">To:\u0020</string>
+    <!-- Shown to display the to recipient(s) of the message [CHAR LIMIT=10] -->
+    <string name="to_heading_no_space">To:</string>
     <!-- Shown to display the cc recipient(s) of the message [CHAR LIMIT=10] -->
-    <string name="cc_heading">Cc:\u0020</string>
+    <string name="cc_heading">Cc:</string>
     <!-- Shown to display the bcc recipient(s) of the message [CHAR LIMIT=10] -->
-    <string name="bcc_heading">Bcc:\u0020</string>
-    <!-- Shown to display the recipient(s) of the message [CHAR LIMIT=10] -->
-    <string name="date_heading">Date:\u0020</string>
+    <string name="bcc_heading">Bcc:</string>
+    <!-- Shown to display the date of the message [CHAR LIMIT=10] -->
+    <string name="date_heading">Date:</string>
     <!-- Displayed above an HTML message to show the images in that message [CHAR LIMIT=40] -->
     <string name="show_images">Show pictures</string>
     <!-- Displayed above an HTML message to always show images in messages from that sender [CHAR LIMIT=40] -->
@@ -886,9 +890,6 @@
     <!-- Action bar title for viewing messages that are attached to another message. -->
     <string name="attached_message">Attached message</string>
 
-    <!-- Shown to display the date of the message when the message was received yesterday. [CHAR LIMIT=50]  -->
-    <string name="date_message_received_yesterday">Yesterday, <xliff:g id="datetime">%1$s</xliff:g></string>
-
     <!-- Content description for the "X" image icon for dismissing a tip. This is used for spoken description of the icon when touch explore is enabled. [CHAR LIMIT=50] -->
     <string name="dismiss_tip_hover_text">Dismiss tip</string>
 
@@ -959,7 +960,7 @@
     <!-- Shown to display the date of the message [CHAR LIMIT=50] -->
     <string name="date_message_received_print"><xliff:g id="day_and_date">%1$s</xliff:g> at <xliff:g id="time">%2$s</xliff:g></string>
     <!-- Shown to display the to recipient(s) of the message if the message is a draft [CHAR LIMIT=20] -->
-    <string name="draft_to_heading">Draft To:\u0020</string>
+    <string name="draft_to_heading">Draft To:</string>
 
     <!-- Shown to display in the message header if the message is a draft and there are no "to" addresses in the draft [CHAR LIMIT=10] -->
     <string name="draft_heading">Draft</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 5373bec..cca2ad7 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -208,7 +208,7 @@
     </style>
 
     <style name="ConversationSubjectStyle">
-        <item name="android:textColor">@color/conv_header_text_dark</item>
+        <item name="android:textColor">@color/conversation_view_text_color_dark</item>
         <item name="android:textIsSelectable">true</item>
         <item name="android:textSize">@dimen/conversation_header_font_size</item>
     </style>
@@ -231,7 +231,7 @@
     <style name="AbstractMessageSenderNameStyle">
         <item name="android:singleLine">true</item>
         <item name="android:textSize">@dimen/message_sender_name_text_size</item>
-        <item name="android:textColor">@color/conv_header_text_dark</item>
+        <item name="android:textColor">@color/conversation_view_text_color_dark</item>
     </style>
 
     <style name="MessageSenderNameStyle" parent="AbstractMessageSenderNameStyle">
@@ -241,7 +241,8 @@
     <style name="AbstractMessageHeaderSubtitleStyle">
         <item name="android:singleLine">true</item>
         <item name="android:textSize">@dimen/message_header_subtitle_text_size</item>
-        <item name="android:textColor">@color/conv_header_text_dark</item>
+        <item name="android:textColor">@color/conversation_view_text_color_light</item>
+        <item name="android:textColorLink">@color/conversation_view_text_color_link_blue</item>
     </style>
 
     <style name="MessageHeaderSubtitleStyle" parent="AbstractMessageHeaderSubtitleStyle">
@@ -251,37 +252,31 @@
     <style name="MessageHeaderSnippetStyle">
         <item name="android:lines">2</item>
         <item name="android:textSize">@dimen/message_header_subtitle_text_size</item>
-        <item name="android:textColor">@color/conv_header_text_light</item>
+        <item name="android:textColor">@color/conversation_view_text_color_light</item>
     </style>
 
     <style name="MessageHeaderSmallStyle">
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:textColor">@color/conv_header_text_dark</item>
-        <item name="android:textSize">@dimen/message_header_subtitle_text_size</item>
+        <item name="android:textColor">@color/conversation_view_text_color_light</item>
+        <item name="android:textSize">@dimen/message_header_small_text_size</item>
     </style>
 
     <style name="MessageHeaderDetailsHeadingStyle" parent="MessageHeaderSmallStyle">
-        <item name="android:layout_marginRight">@dimen/message_header_inner_side_padding</item>
+        <item name="android:layout_marginRight">@dimen/message_details_header_inner_side_padding</item>
     </style>
 
     <style name="AbstractMessageHeaderShowPicsStyle" parent="MessageHeaderSmallStyle">
-        <item name="android:textColor">@color/conv_header_text_light</item>
+        <item name="android:textColor">@color/conversation_view_text_color_light</item>
     </style>
 
     <style name="MessageHeaderShowPicsStyle" parent="AbstractMessageHeaderShowPicsStyle">
-        <item name="android:paddingLeft">@dimen/message_details_header_padding_start_collapsed
-        </item>
+        <item name="android:paddingLeft">@dimen/message_details_header_padding_start_expanded</item>
         <item name="android:paddingRight">@dimen/message_show_pics_header_padding_end</item>
         <item name="android:drawableLeft">@drawable/ic_show_images_holo_light</item>
     </style>
 
-    <style name="AbstractMessageHeaderUpperDateStyle" parent="MessageHeaderSmallStyle">
-        <item name="android:minHeight">24dp</item>
-    </style>
-
-    <style name="MessageHeaderUpperDateStyle" parent="AbstractMessageHeaderUpperDateStyle">
+    <style name="MessageHeaderUpperDateStyle" parent="MessageHeaderSmallStyle">
         <item name="android:layout_alignParentRight">true</item>
+        <item name="android:layout_marginLeft">@dimen/attachment_icon_padding</item>
     </style>
 
     <style name="AbstractMessageAttachmentsHeaderStyle" parent="MessageHeaderSmallStyle">
@@ -296,8 +291,8 @@
     <style name="MessageDetailsValueStyle" parent="MessageHeaderSmallStyle">
         <item name="android:autoLink">email</item>
         <item name="android:linksClickable">true</item>
-        <item name="android:textColor">@color/conv_header_text_light</item>
-        <item name="android:textColorLink">@color/conv_header_text_link_blue</item>
+        <item name="android:textColor">@color/conversation_view_text_color_light</item>
+        <item name="android:textColorLink">@color/conversation_view_text_color_link_blue</item>
         <item name="android:textIsSelectable">true</item>
     </style>
 
@@ -553,8 +548,7 @@
     </style>
 
     <style name="MessageDetailsHeaderStyle">
-        <item name="android:paddingLeft">@dimen/message_details_header_padding_start_collapsed
-        </item>
+        <item name="android:paddingLeft">@dimen/message_details_header_padding_start_expanded</item>
         <item name="android:paddingRight">@dimen/message_details_header_padding_end</item>
     </style>
 
@@ -578,7 +572,6 @@
 
     <style name="ConversationViewMarginStyle">
         <item name="android:layout_marginLeft">@dimen/conversation_view_margin_side</item>
-        <item name="android:layout_marginRight">@dimen/conversation_view_margin_side</item>
     </style>
 
     <style name="FolderListItemStartStyle">
@@ -616,19 +609,11 @@
         <item name="android:layout_marginLeft">@dimen/teaser_text_padding</item>
     </style>
 
-    <style name="DetailsExpanderStyle">
-        <item name="android:layout_marginLeft">@dimen/message_header_inner_side_padding</item>
-    </style>
-
     <style name="AttachmentMarginStyle">
         <item name="android:layout_marginLeft">@dimen/attachment_margin_side</item>
         <item name="android:layout_marginRight">@dimen/attachment_margin_side</item>
     </style>
 
-    <style name="MessageHeaderContactImageStyle">
-        <item name="android:layout_marginLeft">@dimen/message_header_padding_start</item>
-    </style>
-
     <style name="AttachmentIconStyle">
         <item name="android:layout_marginLeft">@dimen/attachment_icon_padding</item>
     </style>
@@ -646,10 +631,6 @@
         <item name="android:layout_marginRight">@dimen/folder_list_item_end_margin</item>
     </style>
 
-    <style name="RecipientSummaryStyle" parent="MessageHeaderSmallStyle">
-        <item name="android:layout_marginRight">@dimen/recipient_summary_margin</item>
-    </style>
-
     <style name="ToastBarDescriptionIconStyle">
         <item name="android:paddingLeft">@dimen/toast_bar_description_icon_padding_start</item>
         <item name="android:paddingRight">@dimen/toast_bar_description_icon_padding_end</item>