diff --git a/res/drawable/ic_menu_select_all.png b/res/drawable/ic_menu_select_all.png
new file mode 100644
index 000000000..be2ced1e1
Binary files /dev/null and b/res/drawable/ic_menu_select_all.png differ
diff --git a/res/menu/message_list_option.xml b/res/menu/message_list_option.xml
index 8ee5192b7..415af52e0 100644
--- a/res/menu/message_list_option.xml
+++ b/res/menu/message_list_option.xml
@@ -37,6 +37,10 @@
 			/>
 		</menu>
 	</item>
+	<item
+        android:id="@+id/select_all"
+		android:title="@string/batch_select_all"
+        android:icon="@drawable/ic_menu_select_all"/>
 	<item
 		android:id="@+id/batch_ops"
 		android:title="@string/batch_ops"
diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index 8acba2c4e..98bc6bf56 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -1153,6 +1153,7 @@ public class MessageList
 
                 return true;
 
+            case R.id.select_all:
             case R.id.batch_select_all:
                 setAllSelected(true);
                 toggleBatchButtons();
@@ -1271,6 +1272,10 @@ public class MessageList
     public boolean onPrepareOptionsMenu(Menu menu)
     {
         boolean anySelected = anySelected();
+
+        menu.findItem(R.id.select_all).setVisible(! anySelected);
+        menu.findItem(R.id.batch_ops).setVisible(anySelected);
+
         setOpsState(menu, true, anySelected);
 
         if (mQueryString != null)