diff --git a/res/menu/email_activity_options.xml b/res/menu/email_activity_options.xml
index d2b85cbda..f6b7fbc38 100644
--- a/res/menu/email_activity_options.xml
+++ b/res/menu/email_activity_options.xml
@@ -39,17 +39,6 @@
         android:icon="@drawable/ic_menu_refresh_holo_light"
         android:showAsAction="ifRoom"
     />
-    <!--
-        STOPSHIP "Show all folders" should be in the account spinner, not here.
-        It's temporary UI until we get the ICS style account spinner.
-    -->
-    <item
-        android:id="@+id/show_all_folders"
-        android:orderInCategory="400"
-        android:title="@string/mailbox_list_account_selector_show_all_folders"
-        android:showAsAction="ifRoom"
-        android:visible="false"
-    />
     <item
         android:id="@+id/account_settings"
         android:orderInCategory="2000"
diff --git a/src/com/android/email/activity/UIControllerOnePane.java b/src/com/android/email/activity/UIControllerOnePane.java
index 070a9a5b6..3f069b774 100644
--- a/src/com/android/email/activity/UIControllerOnePane.java
+++ b/src/com/android/email/activity/UIControllerOnePane.java
@@ -520,21 +520,4 @@ class UIControllerOnePane extends UIControllerBase {
             return mRefreshManager.isMailboxListRefreshing(getActualAccountId());
         }
     }
-
-    @Override
-    public boolean onPrepareOptionsMenu(MenuInflater inflater, Menu menu) {
-        // STOPSHIP For temporary menu item which should be visible only on 1-pane.
-        menu.findItem(R.id.show_all_folders).setVisible(true);
-        return super.onPrepareOptionsMenu(inflater, menu);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.show_all_folders: // STOPSHIP For temporary menu item
-                showAllMailboxes();
-                return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
 }