1 files changed, 6 insertions, 11 deletions
diff --git a/res/menu/conversation_list_selection_actions_menu.xml b/res/menu/conversation_list_selection_actions_menu.xml
index f6766a459..5e0bd55d1 100644
--- a/res/menu/conversation_list_selection_actions_menu.xml
+++ b/res/menu/conversation_list_selection_actions_menu.xml
@@ -19,22 +19,17 @@
 <!-- Menu for the action mode invoked when items are selected
      in the conversation list. Order is important!  -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- Depends on AccountCapabilities.ARCHIVE and
-         FolderCapabilities.ARCHIVE. Only one of archive or
-         remove_folder are shown, and they have the same drawable, so
-         show the first one.
-    -->
     <item
         android:id="@+id/archive"
         android:title="@string/archive"
-        android:showAsAction="never"
+        android:showAsAction="always"
         android:icon="@drawable/ic_archive_wht_24dp"
         android:alphabeticShortcut="@string/trigger_y_char"/>
 
     <item
         android:id="@+id/remove_folder"
         android:title="@string/remove_folder"
-        android:showAsAction="never"
+        android:showAsAction="always"
         android:icon="@drawable/ic_remove_label"
         android:alphabeticShortcut="@string/trigger_y_char"
         android:visible="false" />
@@ -43,13 +38,13 @@
     <item
         android:id="@+id/delete"
         android:title="@string/delete"
-        android:showAsAction="never"
+        android:showAsAction="always"
         android:icon="@drawable/ic_delete_wht_24dp"/>
     <!-- Depends on the user viewing a draft label, and the above menu item not being shown -->
     <item
         android:id="@+id/discard_drafts"
         android:title="@string/discard_drafts"
-        android:showAsAction="never"
+        android:showAsAction="always"
         android:icon="@drawable/ic_delete_wht_24dp"
         android:visible="false" />
 
@@ -57,13 +52,13 @@
     <item
         android:id="@+id/read"
         android:title="@string/mark_read"
-        android:showAsAction="never"
+        android:showAsAction="always"
         android:icon="@drawable/ic_menu_mark_read_holo_light" />
 
     <item
         android:id="@+id/unread"
         android:title="@string/mark_unread"
-        android:showAsAction="never"
+        android:showAsAction="always"
         android:icon="@drawable/ic_markunread_wht_24dp" />
 
     <item