1 files changed, 15 insertions, 24 deletions
diff --git a/res/menu-sw600dp-land/conversation_list_search_results_actions.xml b/res/menu-sw600dp-land/conversation_list_search_results_actions.xml
index 07b518674..64a9d0662 100644
--- a/res/menu-sw600dp-land/conversation_list_search_results_actions.xml
+++ b/res/menu-sw600dp-land/conversation_list_search_results_actions.xml
@@ -17,13 +17,6 @@
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <!-- This invisible menu item is used to map CTRL-C to the compose action -->
-    <item
-        android:id="@+id/compose"
-        android:title="@string/menu_compose"
-        android:visible="false"
-        android:alphabeticShortcut="@string/trigger_compose_char" />
-
     <item android:id="@+id/search"
         android:title="@string/menu_search"
         android:showAsAction="always|collapseActionView"
@@ -33,21 +26,21 @@
     <item
         android:id="@+id/delete"
         android:title="@string/delete"
-        android:showAsAction="ifRoom"
+        android:showAsAction="always"
         android:icon="@drawable/ic_delete_wht_24dp" />
 
-    <!-- Always available -->
+    <item
+        android:id="@+id/inside_conversation_unread"
+        android:title="@string/mark_read"
+        android:showAsAction="always"
+        android:icon="@drawable/ic_markunread_wht_24dp" />
+
     <item
         android:id="@+id/change_folders"
         android:title="@string/menu_change_folders"
         android:showAsAction="never"
         android:icon="@drawable/ic_menu_folders_holo_light" />
 
-    <item android:id="@+id/inside_conversation_unread"
-        android:title="@string/mark_read"
-        android:showAsAction="never"
-        android:icon="@drawable/ic_markunread_wht_24dp" />
-
     <item
         android:id="@+id/mark_important"
         android:title="@string/mark_important"
@@ -63,18 +56,16 @@
         android:title="@string/report_spam"
         android:showAsAction="never" />
 
+    <!-- This invisible menu items are used to enable keyboard shortcuts -->
+    <item
+        android:id="@+id/compose"
+        android:title="@string/menu_compose"
+        android:visible="false"
+        android:alphabeticShortcut="@string/trigger_compose_char" />
+
     <item android:id="@+id/refresh"
         android:title="@string/refresh"
-        android:showAsAction="never"
+        android:visible="false"
         android:alphabeticShortcut="@string/trigger_refresh_char" />
 
-    <item android:id="@+id/settings"
-        android:title="@string/menu_settings"
-        android:showAsAction="never" />
-
-    <item
-        android:id="@+id/help_info_menu_item"
-        android:showAsAction="never"
-        android:title="@string/help_and_feedback" />
-
 </menu>