diff --git a/res/drawable-hdpi/ic_action_copy_holo_dark.png b/res/drawable-hdpi/ic_action_copy_holo_dark.png
new file mode 100644
index 0000000000..f97df1d51e
Binary files /dev/null and b/res/drawable-hdpi/ic_action_copy_holo_dark.png differ
diff --git a/res/drawable-hdpi/ic_action_copy_holo_light.png b/res/drawable-hdpi/ic_action_copy_holo_light.png
new file mode 100644
index 0000000000..22327391e9
Binary files /dev/null and b/res/drawable-hdpi/ic_action_copy_holo_light.png differ
diff --git a/res/drawable-hdpi/ic_action_forward_holo_dark.png b/res/drawable-hdpi/ic_action_forward_holo_dark.png
new file mode 100644
index 0000000000..f89dc8b078
Binary files /dev/null and b/res/drawable-hdpi/ic_action_forward_holo_dark.png differ
diff --git a/res/drawable-hdpi/ic_action_forward_holo_light.png b/res/drawable-hdpi/ic_action_forward_holo_light.png
new file mode 100644
index 0000000000..5feffbd79f
Binary files /dev/null and b/res/drawable-hdpi/ic_action_forward_holo_light.png differ
diff --git a/res/drawable-hdpi/ic_action_save_holo_dark.png b/res/drawable-hdpi/ic_action_save_holo_dark.png
new file mode 100644
index 0000000000..0fe36a1ec3
Binary files /dev/null and b/res/drawable-hdpi/ic_action_save_holo_dark.png differ
diff --git a/res/drawable-hdpi/ic_action_save_holo_light.png b/res/drawable-hdpi/ic_action_save_holo_light.png
new file mode 100644
index 0000000000..c4b7783ccc
Binary files /dev/null and b/res/drawable-hdpi/ic_action_save_holo_light.png differ
diff --git a/res/drawable-mdpi/ic_action_copy_holo_dark.png b/res/drawable-mdpi/ic_action_copy_holo_dark.png
new file mode 100644
index 0000000000..d846e72c61
Binary files /dev/null and b/res/drawable-mdpi/ic_action_copy_holo_dark.png differ
diff --git a/res/drawable-mdpi/ic_action_copy_holo_light.png b/res/drawable-mdpi/ic_action_copy_holo_light.png
new file mode 100644
index 0000000000..7134820209
Binary files /dev/null and b/res/drawable-mdpi/ic_action_copy_holo_light.png differ
diff --git a/res/drawable-mdpi/ic_action_forward_holo_dark.png b/res/drawable-mdpi/ic_action_forward_holo_dark.png
new file mode 100644
index 0000000000..d61dc5dc4b
Binary files /dev/null and b/res/drawable-mdpi/ic_action_forward_holo_dark.png differ
diff --git a/res/drawable-mdpi/ic_action_forward_holo_light.png b/res/drawable-mdpi/ic_action_forward_holo_light.png
new file mode 100644
index 0000000000..2ecf7f99c6
Binary files /dev/null and b/res/drawable-mdpi/ic_action_forward_holo_light.png differ
diff --git a/res/drawable-mdpi/ic_action_save_holo_dark.png b/res/drawable-mdpi/ic_action_save_holo_dark.png
new file mode 100644
index 0000000000..664260d8c6
Binary files /dev/null and b/res/drawable-mdpi/ic_action_save_holo_dark.png differ
diff --git a/res/drawable-mdpi/ic_action_save_holo_light.png b/res/drawable-mdpi/ic_action_save_holo_light.png
new file mode 100644
index 0000000000..61304a68c7
Binary files /dev/null and b/res/drawable-mdpi/ic_action_save_holo_light.png differ
diff --git a/res/drawable-xhdpi/ic_action_copy_holo_dark.png b/res/drawable-xhdpi/ic_action_copy_holo_dark.png
new file mode 100644
index 0000000000..a6e1aa290b
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_copy_holo_dark.png differ
diff --git a/res/drawable-xhdpi/ic_action_copy_holo_light.png b/res/drawable-xhdpi/ic_action_copy_holo_light.png
new file mode 100644
index 0000000000..5ddf15139b
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_copy_holo_light.png differ
diff --git a/res/drawable-xhdpi/ic_action_forward_holo_dark.png b/res/drawable-xhdpi/ic_action_forward_holo_dark.png
new file mode 100644
index 0000000000..814485f585
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_forward_holo_dark.png differ
diff --git a/res/drawable-xhdpi/ic_action_forward_holo_light.png b/res/drawable-xhdpi/ic_action_forward_holo_light.png
new file mode 100644
index 0000000000..8cd5f0f0a1
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_forward_holo_light.png differ
diff --git a/res/drawable-xhdpi/ic_action_save_holo_dark.png b/res/drawable-xhdpi/ic_action_save_holo_dark.png
new file mode 100644
index 0000000000..dde278b5e2
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_save_holo_dark.png differ
diff --git a/res/drawable-xhdpi/ic_action_save_holo_light.png b/res/drawable-xhdpi/ic_action_save_holo_light.png
new file mode 100644
index 0000000000..29c5f4d3b4
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_save_holo_light.png differ
diff --git a/res/drawable-xxhdpi/ic_action_copy_holo_dark.png b/res/drawable-xxhdpi/ic_action_copy_holo_dark.png
new file mode 100644
index 0000000000..a381cdc3fd
Binary files /dev/null and b/res/drawable-xxhdpi/ic_action_copy_holo_dark.png differ
diff --git a/res/drawable-xxhdpi/ic_action_copy_holo_light.png b/res/drawable-xxhdpi/ic_action_copy_holo_light.png
new file mode 100644
index 0000000000..a0508df8c4
Binary files /dev/null and b/res/drawable-xxhdpi/ic_action_copy_holo_light.png differ
diff --git a/res/drawable-xxhdpi/ic_action_forward_holo_dark.png b/res/drawable-xxhdpi/ic_action_forward_holo_dark.png
new file mode 100644
index 0000000000..f5b928bafe
Binary files /dev/null and b/res/drawable-xxhdpi/ic_action_forward_holo_dark.png differ
diff --git a/res/drawable-xxhdpi/ic_action_forward_holo_light.png b/res/drawable-xxhdpi/ic_action_forward_holo_light.png
new file mode 100644
index 0000000000..ef3d2bfd50
Binary files /dev/null and b/res/drawable-xxhdpi/ic_action_forward_holo_light.png differ
diff --git a/res/drawable-xxhdpi/ic_action_save_holo_dark.png b/res/drawable-xxhdpi/ic_action_save_holo_dark.png
new file mode 100644
index 0000000000..ccf8c82cd5
Binary files /dev/null and b/res/drawable-xxhdpi/ic_action_save_holo_dark.png differ
diff --git a/res/drawable-xxhdpi/ic_action_save_holo_light.png b/res/drawable-xxhdpi/ic_action_save_holo_light.png
new file mode 100644
index 0000000000..744350049a
Binary files /dev/null and b/res/drawable-xxhdpi/ic_action_save_holo_light.png differ
diff --git a/res/drawable/conversation_item_background.xml b/res/drawable/conversation_item_background.xml
new file mode 100644
index 0000000000..fb3ecc7153
--- /dev/null
+++ b/res/drawable/conversation_item_background.xml
@@ -0,0 +1,5 @@
+
+
+
+
diff --git a/res/drawable/conversation_item_background_dark.xml b/res/drawable/conversation_item_background_dark.xml
new file mode 100644
index 0000000000..d7fb6e05f6
--- /dev/null
+++ b/res/drawable/conversation_item_background_dark.xml
@@ -0,0 +1,5 @@
+
+
+
+
diff --git a/res/layout/conversation_item_received.xml b/res/layout/conversation_item_received.xml
index 6446aacff5..3c41d8b18d 100644
--- a/res/layout/conversation_item_received.xml
+++ b/res/layout/conversation_item_received.xml
@@ -4,6 +4,7 @@
android:layout_height="wrap_content"
android:paddingRight="10dip"
android:orientation="vertical"
+ android:background="?conversation_item_background"
xmlns:android="http://schemas.android.com/apk/res/android">
+ android:orientation="horizontal"
+ android:background="?conversation_item_background" >
diff --git a/res/menu/conversation_context_image.xml b/res/menu/conversation_context_image.xml
deleted file mode 100644
index c01aea5213..0000000000
--- a/res/menu/conversation_context_image.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index e6c50a212f..7eb175e1a4 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -32,6 +32,7 @@
+
@@ -69,6 +70,10 @@
+
+
+
+
diff --git a/res/values/themes.xml b/res/values/themes.xml
index f426ea8409..7adfe3a62b 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -47,6 +47,7 @@
- @drawable/ic_emoji_dark
- @drawable/ic_ime_dark
+ - @drawable/conversation_item_background
- @drawable/conversation_item_received_shape
- @drawable/conversation_item_received_triangle_shape
- @drawable/conversation_item_sent_shape
@@ -74,6 +75,10 @@
- @drawable/ic_menu_split_holo_light
- @drawable/ic_menu_accept_holo_light
- @drawable/ic_menu_refresh_holo_light
+ - @drawable/ic_action_copy_holo_light
+ - @drawable/ic_dialog_info_holo_light
+ - @drawable/ic_action_forward_holo_light
+ - @drawable/ic_action_save_holo_light