From d92a30f8075d511e96a9dd80fe3a8fed38bb7189 Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@bestpractical.com>
Date: Mon, 11 Feb 2013 15:21:36 -0500
Subject: [PATCH] Experimental change to move most of our refile buttons into a
 refile submenu. Specifically to elicit feedback. I don't expect this change
 to stick around in its current form. But I do want to get a sense of whether
 it's something that makes people happy or angry

---
 res/menu/message_list_option.xml          | 49 +++++++++++++----------
 res/values/strings.xml                    |  1 +
 src/com/fsck/k9/activity/MessageList.java |  5 +--
 3 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/res/menu/message_list_option.xml b/res/menu/message_list_option.xml
index ff5ff8659..df7999d58 100644
--- a/res/menu/message_list_option.xml
+++ b/res/menu/message_list_option.xml
@@ -81,30 +81,37 @@
 
     <!-- MessageView -->
     <item
-        android:id="@+id/archive"
-        android:icon="?attr/iconActionArchive"
-        android:showAsAction="ifRoom"
-        android:title="@string/archive_action"/>
+        android:id="@+id/refile"
+        android:icon="?attr/iconActionSingleMessageOptions"
+        android:showAsAction="never"
+        android:title="@string/refile_action">
+        <menu>
+            <item
+                android:id="@+id/archive"
+                android:icon="?attr/iconActionArchive"
+                android:showAsAction="ifRoom"
+                android:title="@string/archive_action"/>
 
-    <!-- MessageView -->
-    <item
-        android:id="@+id/spam"
-        android:icon="?attr/iconActionSpam"
-        android:showAsAction="ifRoom"
-        android:title="@string/spam_action"/>
+            <!-- MessageView -->
+            <item
+                android:id="@+id/spam"
+                android:icon="?attr/iconActionSpam"
+                android:showAsAction="ifRoom"
+                android:title="@string/spam_action"/>
 
-    <!-- MessageView -->
-    <item
-        android:id="@+id/move"
-        android:icon="?attr/iconActionMoveOrCopy"
-        android:showAsAction="ifRoom"
-        android:title="@string/move_action"/>
-
-    <!-- MessageView -->
-    <item
-        android:id="@+id/copy"
-        android:title="@string/copy_action"/>
+            <!-- MessageView -->
+            <item
+                android:id="@+id/move"
+                android:icon="?attr/iconActionMoveOrCopy"
+                android:showAsAction="ifRoom"
+                android:title="@string/move_action"/>
 
+            <!-- MessageView -->
+            <item
+                android:id="@+id/copy"
+                android:title="@string/copy_action"/>
+        </menu>
+    </item>
     <!-- MessageView -->
     <item
         android:id="@+id/toggle_unread"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 026a0334b..3a63f74d5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -137,6 +137,7 @@ Please submit bug reports, contribute new features and ask questions at
     <string name="forward_action">Forward</string>
     <string name="move_action">Move</string>
     <string name="single_message_options_action">Send</string>
+    <string name="refile_action">Refile</string>
 
     <string name="continue_action">Continue</string>
     <string name="back_action">Back</string>
diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index 0c2bdf3b6..3bd249beb 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -930,10 +930,7 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme
             menu.findItem(R.id.previous_message).setVisible(false);
             menu.findItem(R.id.delete).setVisible(false);
             menu.findItem(R.id.single_message_options).setVisible(false);
-            menu.findItem(R.id.archive).setVisible(false);
-            menu.findItem(R.id.spam).setVisible(false);
-            menu.findItem(R.id.move).setVisible(false);
-            menu.findItem(R.id.copy).setVisible(false);
+            menu.findItem(R.id.refile).setVisible(false);
             menu.findItem(R.id.toggle_unread).setVisible(false);
             menu.findItem(R.id.select_text).setVisible(false);
             menu.findItem(R.id.toggle_message_view_theme).setVisible(false);