diff --git a/res/drawable-hdpi/message_header_bg_holo.9.png b/res/drawable-hdpi/message_header_bg_holo.9.png
new file mode 100644
index 000000000..3914056fe
Binary files /dev/null and b/res/drawable-hdpi/message_header_bg_holo.9.png differ
diff --git a/res/drawable-mdpi/message_header_bg_holo.9.png b/res/drawable-mdpi/message_header_bg_holo.9.png
new file mode 100644
index 000000000..bca045c27
Binary files /dev/null and b/res/drawable-mdpi/message_header_bg_holo.9.png differ
diff --git a/res/drawable-xhdpi/message_header_bg_holo.9.png b/res/drawable-xhdpi/message_header_bg_holo.9.png
new file mode 100644
index 000000000..bc9ed31fb
Binary files /dev/null and b/res/drawable-xhdpi/message_header_bg_holo.9.png differ
diff --git a/res/layout-land/message_view_header_actions.xml b/res/layout-land/message_view_header_actions.xml
index df098f819..20e1aa2fa 100644
--- a/res/layout-land/message_view_header_actions.xml
+++ b/res/layout-land/message_view_header_actions.xml
@@ -15,35 +15,31 @@
-->
-
-
-
-
+
diff --git a/res/layout-sw600dp/message_view_fragment.xml b/res/layout-sw600dp/message_view_fragment.xml
index a25553d29..790ecaab5 100644
--- a/res/layout-sw600dp/message_view_fragment.xml
+++ b/res/layout-sw600dp/message_view_fragment.xml
@@ -19,7 +19,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="#ffffffff"
+ android:background="@android:color/white"
>
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -196,8 +85,8 @@
android:id="@+id/address_divider"
android:layout_width="0dip"
android:layout_below="@id/message_view_subheader"
- android:layout_alignLeft="@id/badge"
- android:layout_alignRight="@id/header_background"
+ android:layout_alignLeft="@id/message_view_header_upper"
+ android:layout_alignRight="@id/message_view_header_upper"
style="@style/message_view_horizontal_divider"
/>
@@ -209,8 +98,8 @@
android:layout_width="0dip"
android:layout_height="0dip"
android:layout_below="@id/address_divider"
- android:layout_alignLeft="@id/badge"
- android:layout_alignRight="@id/header_background"
+ android:layout_alignLeft="@id/message_view_header_upper"
+ android:layout_alignRight="@id/message_view_header_upper"
android:layout_alignParentBottom="true"
android:orientation="vertical"
>
diff --git a/res/layout-sw600dp/message_view_header_actions.xml b/res/layout-sw600dp/message_view_header_actions.xml
new file mode 100644
index 000000000..0e01967e7
--- /dev/null
+++ b/res/layout-sw600dp/message_view_header_actions.xml
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/res/layout/message_view_fragment.xml b/res/layout/message_view_fragment.xml
index 72caf905c..09b4772c7 100644
--- a/res/layout/message_view_fragment.xml
+++ b/res/layout/message_view_fragment.xml
@@ -19,7 +19,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="#ffffffff"
+ android:background="@android:color/white"
>
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
diff --git a/res/layout/message_view_header_upper.xml b/res/layout/message_view_header_upper.xml
new file mode 100644
index 000000000..385766f68
--- /dev/null
+++ b/res/layout/message_view_header_upper.xml
@@ -0,0 +1,75 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/res/values-land/styles.xml b/res/values-land/styles.xml
index db4d51f28..1245fc070 100644
--- a/res/values-land/styles.xml
+++ b/res/values-land/styles.xml
@@ -46,4 +46,12 @@
+
+
diff --git a/res/values-sw600dp/dimensions.xml b/res/values-sw600dp/dimensions.xml
index a427c87d2..a8141ee39 100644
--- a/res/values-sw600dp/dimensions.xml
+++ b/res/values-sw600dp/dimensions.xml
@@ -16,6 +16,12 @@
+
+ 68dip
+ 4dip
+ 64dip
+ 16dip
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
index 1b2aadfb7..05ad1c731 100644
--- a/res/values-sw600dp/styles.xml
+++ b/res/values-sw600dp/styles.xml
@@ -105,9 +105,26 @@
- @color/text_primary_color
- true
+
+
+
+
+
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index eceb3161b..596d296a9 100644
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -23,6 +23,13 @@
35dip
6dip
+
+ 52dip
+ 4dip
+ 48dip
+ 4dip
+
48dip
14sp
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f95aedd58..4d66cfcb9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -23,8 +23,6 @@
-
-
@@ -99,6 +97,9 @@
Delete
Forward
+
+ Star
Done
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 65003c7e6..fd71530a0 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -201,5 +201,27 @@
+
+
+
+
+
+