From 87e437b38858656f6701e4217915be605784a520 Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@bestpractical.com>
Date: Sat, 8 Sep 2012 22:55:43 -0400
Subject: [PATCH] Move "move" and "copy" out of a submenu

---
 res/menu/message_view_option.xml          | 24 +++++++++--------------
 src/com/fsck/k9/activity/MessageList.java |  7 -------
 2 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/res/menu/message_view_option.xml b/res/menu/message_view_option.xml
index d2e1866d9..f7b056760 100644
--- a/res/menu/message_view_option.xml
+++ b/res/menu/message_view_option.xml
@@ -52,21 +52,15 @@
         android:showAsAction="ifRoom"
     />
     <item
-		android:id="@+id/move_or_copy"
-	    android:title="@string/move_or_copy_action"
-	    android:showAsAction="ifRoom"
-	    android:icon="?attr/iconActionMoveOrCopy">
-	    <menu>
-		    <item
-		        android:id="@+id/move"
-		        android:title="@string/move_action"
-		    />
-		    <item
-		        android:id="@+id/copy"
-		        android:title="@string/copy_action"
-		    />
-		</menu>
-	</item>
+        android:id="@+id/move"
+            android:showAsAction="ifRoom"
+                android:icon="?attr/iconActionMoveOrCopy"
+        android:title="@string/move_action"
+    />
+    <item
+        android:id="@+id/copy"
+        android:title="@string/copy_action"
+    />
 	<item
         android:id="@+id/toggle_unread"
         android:alphabeticShortcut="u"
diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index 2321ebea8..d60dd2a8f 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -2792,7 +2792,6 @@ public class MessageList extends K9ListActivity implements OnItemClickListener,
 	            menu.findItem(R.id.archive).setVisible(true);
 	            menu.findItem(R.id.spam).setVisible(true);
 	            menu.findItem(R.id.copy).setVisible(true);
-	            menu.findItem(R.id.move_or_copy).setVisible(true);
 
 	            // hide uncapable
 				/*
@@ -2846,7 +2845,6 @@ public class MessageList extends K9ListActivity implements OnItemClickListener,
 			if (mQueryString != null) {
 	            menu.findItem(R.id.move).setVisible(false);
 	            menu.findItem(R.id.copy).setVisible(false);
-	            menu.findItem(R.id.move_or_copy).setVisible(false);
 
 	            menu.findItem(R.id.archive).setVisible(false);
 	            menu.findItem(R.id.spam).setVisible(false);
@@ -2865,11 +2863,6 @@ public class MessageList extends K9ListActivity implements OnItemClickListener,
 	            menu.findItem(R.id.spam).setVisible(false);
 	        }
 
-	        if (!mController.isMoveCapable(mAccount)
-				&& !mController.isCopyCapable(mAccount)) {
-	            menu.findItem(R.id.move_or_copy).setVisible(false);
-	        }
-
 	        if (!mAccount.hasArchiveFolder()) {
 	            menu.findItem(R.id.archive).setVisible(false);
 	        }