Use contextual action bar menu for conversation items.

res/drawable/conversation_item_background.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="true" android:state_selected="true"
+          android:drawable="@drawable/list_selected_holo_light" />
+</selector>

res/drawable/conversation_item_background_dark.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="true" android:state_selected="true"
+          android:drawable="@drawable/list_selected_holo_dark" />
+</selector>

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">
 
     <TextView android:id="@+id/group_message_status"

res/layout/conversation_item_sent.xml

@@ -4,7 +4,8 @@
     android:id="@+id/conversation_item"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal">
+    android:orientation="horizontal"
+    android:background="?conversation_item_background" >
 
     <RelativeLayout android:layout_width="match_parent"
                     android:layout_height="wrap_content"

res/menu/conversation_context.xml

@@ -1,18 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:title="@string/conversation_context__menu_copy_text"
-          android:id="@+id/menu_context_copy" />
+    <item android:title="@string/conversation_context__menu_message_details"
+          android:id="@+id/menu_context_details"
+          android:icon="?menu_info_icon"
+          android:showAsAction="always" />
 
     <item android:title="@string/conversation_context__menu_delete_message"
-          android:id="@+id/menu_context_delete_message" />
+        android:id="@+id/menu_context_delete_message"
+        android:icon="?menu_trash_icon"
+        android:showAsAction="always" />
 
-    <item android:title="@string/conversation_context__menu_message_details"
-          android:id="@+id/menu_context_details" />
+    <item android:title="@string/conversation_context__menu_copy_text"
+          android:id="@+id/menu_context_copy"
+          android:icon="?menu_copy_icon"
+          android:showAsAction="always" />
 
     <item android:title="@string/conversation_context__menu_forward_message"
-          android:id="@+id/menu_context_forward" />
+          android:id="@+id/menu_context_forward"
+          android:icon="?menu_forward_icon"
+          android:showAsAction="ifRoom" />
 
     <item android:title="@string/conversation_context__menu_resend_message"
           android:id="@+id/menu_context_resend"
-          android:visible="false" />
+          android:visible="false"
+          android:showAsAction="never" />
+
+    <item android:title="@string/conversation_context_image__save_attachment"
+          android:id="@+id/menu_context_save_attachment"
+          android:visible="false"
+          android:icon="?menu_save_icon"
+          android:showAsAction="always" />
 </menu>

res/menu/conversation_context_image.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:title="@string/conversation_context_image__save_attachment"
-          android:id="@+id/menu_context_save_attachment" />
-</menu>

res/values/attrs.xml

@@ -32,6 +32,7 @@
     <attr name="conversation_emoji_toggle" format="reference"/>
     <attr name="conversation_keyboard_toggle" format="reference"/>
 
+    <attr name="conversation_item_background" format="reference"/>
     <attr name="conversation_item_received_background" format="reference" />
     <attr name="conversation_item_received_triangle_background" format="reference" />
     <attr name="conversation_item_sent_background" format="reference" />
@@ -69,6 +70,10 @@
     <attr name="menu_split_icon" format="reference" />
     <attr name="menu_accept_icon" format="reference" />
     <attr name="menu_refresh_directory" format="reference" />
+    <attr name="menu_copy_icon" format="reference" />
+    <attr name="menu_info_icon" format="reference" />
+    <attr name="menu_forward_icon" format="reference" />
+    <attr name="menu_save_icon" format="reference" />
 
     <declare-styleable name="ForegroundImageView">
         <attr name="android:foreground" />

res/values/themes.xml

@@ -47,6 +47,7 @@
         <item name="conversation_emoji_toggle">@drawable/ic_emoji_dark</item>
         <item name="conversation_keyboard_toggle">@drawable/ic_ime_dark</item>
 
+        <item name="conversation_item_background">@drawable/conversation_item_background</item>
         <item name="conversation_item_received_background">@drawable/conversation_item_received_shape</item>
         <item name="conversation_item_received_triangle_background">@drawable/conversation_item_received_triangle_shape</item>
         <item name="conversation_item_sent_background">@drawable/conversation_item_sent_shape</item>
@@ -74,6 +75,10 @@
         <item name="menu_split_icon">@drawable/ic_menu_split_holo_light</item>
         <item name="menu_accept_icon">@drawable/ic_menu_accept_holo_light</item>
         <item name="menu_refresh_directory">@drawable/ic_menu_refresh_holo_light</item>
+        <item name="menu_copy_icon">@drawable/ic_action_copy_holo_light</item>
+        <item name="menu_info_icon">@drawable/ic_dialog_info_holo_light</item>
+        <item name="menu_forward_icon">@drawable/ic_action_forward_holo_light</item>
+        <item name="menu_save_icon">@drawable/ic_action_save_holo_light</item>
     </style>
 
     <style name="TextSecure.LightTheme.NavigationDrawer"
@@ -110,6 +115,7 @@
         <item name="contact_selection_label_text">#66eeeeee</item>
         <item name="conversation_selection_header_text">#66eeeeee</item>
 
+        <item name="conversation_item_background">@drawable/conversation_item_background_dark</item>
         <item name="conversation_item_received_background">@drawable/conversation_item_received_shape_dark</item>
         <item name="conversation_item_received_triangle_background">@drawable/conversation_item_received_triangle_shape_dark</item>
         <item name="conversation_item_sent_background">@drawable/conversation_item_sent_shape_dark</item>
@@ -150,6 +156,10 @@
         <item name="menu_split_icon">@drawable/ic_menu_split_holo_dark</item>
         <item name="menu_accept_icon">@drawable/ic_menu_accept_holo_dark</item>
         <item name="menu_refresh_directory">@drawable/ic_menu_refresh_holo_dark</item>
+        <item name="menu_copy_icon">@drawable/ic_action_copy_holo_dark</item>
+        <item name="menu_info_icon">@drawable/ic_dialog_info_holo_dark</item>
+        <item name="menu_forward_icon">@drawable/ic_action_forward_holo_dark</item>
+        <item name="menu_save_icon">@drawable/ic_action_save_holo_dark</item>
     </style>
 
     <style name="TextSecure.DarkTheme.NavigationDrawer"