diff --git a/res/menu/accounts_option.xml b/res/menu/accounts_option.xml
index 967abf562..aa9916b9e 100644
--- a/res/menu/accounts_option.xml
+++ b/res/menu/accounts_option.xml
@@ -30,11 +30,6 @@
         <item android:id="@+id/search"
         android:title="@string/search_action" />
     -->
-    <item
-        android:id="@+id/edit_prefs"
-        android:icon="@android:drawable/ic_menu_preferences"
-        android:showAsAction="never"
-        android:title="@string/preferences_action"/>
     <item
         android:id="@+id/import_export"
         android:title="@string/import_export_action">
@@ -47,5 +42,10 @@
                 android:title="@string/settings_import"/>
         </menu>
     </item>
+    <item
+        android:id="@+id/edit_prefs"
+        android:icon="@android:drawable/ic_menu_preferences"
+        android:showAsAction="never"
+        android:title="@string/preferences_action"/>
 
 </menu>
\ No newline at end of file
diff --git a/res/menu/folder_list_option.xml b/res/menu/folder_list_option.xml
index d536bf431..fd2e68f66 100644
--- a/res/menu/folder_list_option.xml
+++ b/res/menu/folder_list_option.xml
@@ -48,6 +48,20 @@
         android:alphabeticShortcut="e"
         android:icon="?attr/iconMenuDelete"
         android:title="@string/empty_trash_action"/>
+    <item
+        android:id="@+id/send_messages"
+        android:icon="?attr/iconMenuRefresh"
+        android:title="@string/send_messages_action"/>
+    <item
+        android:id="@+id/advanced"
+        android:title="@string/advanced">
+        <menu>
+            <item
+                android:id="@+id/compact"
+                android:icon="?attr/iconMenuCompact"
+                android:title="@string/compact_action"/>
+        </menu>
+    </item>
     <item
         android:id="@+id/settings"
         android:icon="?attr/iconMenuPreferences"
@@ -64,19 +78,5 @@
                 android:title="@string/global_settings_action"/>
         </menu>
     </item>
-    <item
-        android:id="@+id/send_messages"
-        android:icon="?attr/iconMenuRefresh"
-        android:title="@string/send_messages_action"/>
-    <item
-        android:id="@+id/advanced"
-        android:title="@string/advanced">
-        <menu>
-            <item
-                android:id="@+id/compact"
-                android:icon="?attr/iconMenuCompact"
-                android:title="@string/compact_action"/>
-        </menu>
-    </item>
 
 </menu>
\ No newline at end of file
diff --git a/res/menu/message_list_option.xml b/res/menu/message_list_option.xml
index c0fd7638e..49c80f8fb 100644
--- a/res/menu/message_list_option.xml
+++ b/res/menu/message_list_option.xml
@@ -58,6 +58,10 @@
         android:icon="?attr/iconMenuInbox"
         android:showAsAction="never"
         android:title="@string/mark_all_as_read_action"/>
+    <item
+        android:id="@+id/expunge"
+        android:showAsAction="never"
+        android:title="@string/expunge_action"/>
     <item
         android:id="@+id/settings"
         android:icon="?attr/iconMenuPreferences"
@@ -78,9 +82,5 @@
                 android:title="@string/global_settings_action"/>
         </menu>
     </item>
-    <item
-        android:id="@+id/expunge"
-        android:showAsAction="never"
-        android:title="@string/expunge_action"/>
 
 </menu>
\ No newline at end of file