diff --git a/res/menu/accounts_context.xml b/res/menu/accounts_context.xml
index afd94bcb4..e1b486c30 100644
--- a/res/menu/accounts_context.xml
+++ b/res/menu/accounts_context.xml
@@ -6,17 +6,9 @@
         android:title="@string/check_mail_action" />
     <item android:id="@+id/empty_trash"
         android:title="@string/empty_trash_action" />
-    <item
-        android:id="@+id/settings"
-        android:title="@string/preferences_action"
-        android:icon="@drawable/ic_menu_preferences">
-        <menu>
-            <item android:id="@+id/edit_account"
-                android:title="@string/account_settings_action" />
-            <item android:id="@+id/export"
-                android:title="@string/settings_export_account" /> 
-        </menu>
-    </item>
+    <item android:id="@+id/edit_account"
+        android:icon="@drawable/ic_menu_preferences"
+        android:title="@string/account_settings_action" />
     <item android:id="@+id/advanced"
         android:title="@string/advanced">
         <menu>
@@ -30,6 +22,8 @@
         android:title="@string/remove_account_action" />
     <item android:id="@+id/clear_pending"
         android:title="@string/clear_pending_action" />
+    <item android:id="@+id/export"
+        android:title="@string/settings_export_account" />
     </menu>
     </item>
 </menu>
diff --git a/res/menu/accounts_option.xml b/res/menu/accounts_option.xml
index f03ef2c5b..7e782ac19 100644
--- a/res/menu/accounts_option.xml
+++ b/res/menu/accounts_option.xml
@@ -31,12 +31,11 @@
 		<item android:id="@+id/search"
 		android:title="@string/search_action" />
 	-->
-        <item android:id="@+id/settings"
-        android:title="@string/preferences_action" 
-        android:icon="@android:drawable/ic_menu_preferences">
-        <menu>
             <item android:id="@+id/edit_prefs"
                 android:title="@string/global_settings_action"  />
+        <item android:id="@+id/import_export"
+            android:title="@string/import_export_action">
+        <menu>
             <item android:id="@+id/export_all"
                android:title="@string/settings_export_all" /> 
             <item android:id="@+id/import_settings"