diff --git a/res/menu/message_list_option.xml b/res/menu/message_list_option.xml
index aa97fed97..326771978 100644
--- a/res/menu/message_list_option.xml
+++ b/res/menu/message_list_option.xml
@@ -204,7 +204,10 @@
         android:id="@+id/toggle_message_view_theme"
         android:showAsAction="never"
         android:title="@string/message_view_theme_action_dark"/>
-
+    <item 
+        android:id="@+id/show_folder_list"
+        android:showAsAction="never"
+        android:title="@string/folders_title" />
     <!-- always -->
     <item
         android:id="@+id/settings"
diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index 69d9ce266..957b4ce01 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -825,6 +825,10 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme
                 mMessageListFragment.markAllAsRead();
                 return true;
             }
+            case R.id.show_folder_list: {
+                onShowFolderList();
+                return true;
+            }
             // MessageView
             case R.id.next_message: {
                 showNextMessage();