From 3c17043615b272b1714de20cc293268c1cc566b2 Mon Sep 17 00:00:00 2001
From: Sander Bogaert <Sander.Bogaert@tworoadssoftware.com>
Date: Wed, 25 Jul 2012 16:27:33 -0400
Subject: [PATCH] Force settings option in overflow menu on accounts and
 folders activities.

---
 res/menu/accounts_option.xml    | 1 +
 res/menu/folder_list_option.xml | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/res/menu/accounts_option.xml b/res/menu/accounts_option.xml
index 82ea3303f..c5b7acdfa 100644
--- a/res/menu/accounts_option.xml
+++ b/res/menu/accounts_option.xml
@@ -34,6 +34,7 @@
         <item android:id="@+id/edit_prefs"
         android:title="@string/preferences_action" 
         android:icon="@android:drawable/ic_menu_preferences"
+        android:showAsAction="never"
     />
         <item android:id="@+id/import_export"
             android:title="@string/import_export_action">
diff --git a/res/menu/folder_list_option.xml b/res/menu/folder_list_option.xml
index 3a8c5d734..c7a458297 100644
--- a/res/menu/folder_list_option.xml
+++ b/res/menu/folder_list_option.xml
@@ -61,7 +61,8 @@
     <item
         android:id="@+id/settings"
         android:title="@string/preferences_action"
-        android:icon="@drawable/ic_menu_preferences">
+        android:icon="@drawable/ic_menu_preferences"
+        android:showAsAction="never">
         <menu>
         <item
             android:id="@+id/account_settings"