From cfc12ba8f21000357fb0b61b2c20a2150d470583 Mon Sep 17 00:00:00 2001
From: Sander Bogaert <Sander.Bogaert@tworoadssoftware.com>
Date: Fri, 24 Aug 2012 11:13:58 -0400
Subject: [PATCH] Changed order of actions on the bar as suggested. Compose on
 the right now.

---
 res/menu/accounts_option.xml    | 24 ++++++++++++------------
 res/menu/folder_list_option.xml | 14 +++++++-------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/res/menu/accounts_option.xml b/res/menu/accounts_option.xml
index 9340f878e..a233a73b2 100644
--- a/res/menu/accounts_option.xml
+++ b/res/menu/accounts_option.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-	<item
-		android:id="@+id/compose"
-        android:alphabeticShortcut="c"
-        android:title="@string/compose_action"
-		android:icon="@drawable/ic_action_compose"
+    <item
+		android:id="@+id/check_mail"
+        android:alphabeticShortcut="r"
+		android:title="@string/check_mail_action"
+		android:icon="@drawable/ic_action_refresh"
 		android:showAsAction="always"
 	/>
 	<item
@@ -13,6 +13,13 @@
 		android:icon="@drawable/ic_action_search"
 		android:showAsAction="always"
 	/>
+	<item
+		android:id="@+id/compose"
+        android:alphabeticShortcut="c"
+        android:title="@string/compose_action"
+		android:icon="@drawable/ic_action_compose"
+		android:showAsAction="always"
+	/>
 	<item
 		android:id="@+id/add_new_account"
 		android:title="@string/add_account_action"
@@ -23,13 +30,6 @@
         android:title="@string/about_action"
         android:icon="@android:drawable/ic_menu_info_details"
     />
-	<item
-		android:id="@+id/check_mail"
-        android:alphabeticShortcut="r"
-		android:title="@string/check_mail_action"
-		android:icon="@drawable/ic_action_refresh"
-		android:showAsAction="always"
-	/>
 	<!-- 
 		<item android:id="@+id/search"
 		android:title="@string/search_action" />
diff --git a/res/menu/folder_list_option.xml b/res/menu/folder_list_option.xml
index 7a840c9e1..2beab4381 100644
--- a/res/menu/folder_list_option.xml
+++ b/res/menu/folder_list_option.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
+	<item
+		android:id="@+id/check_mail"
+        android:alphabeticShortcut="r"
+		android:title="@string/check_mail_action"
+		android:icon="@drawable/ic_action_refresh"
+		android:showAsAction="always"
+	/>
    <item
 		android:id="@+id/compose"
         android:alphabeticShortcut="c"
@@ -51,13 +58,6 @@
 		android:title="@string/empty_trash_action"
 		android:icon="@drawable/ic_menu_delete"
 	/>
-	<item
-		android:id="@+id/check_mail"
-        android:alphabeticShortcut="r"
-		android:title="@string/check_mail_action"
-		android:icon="@drawable/ic_action_refresh"
-		android:showAsAction="always"
-	/>
     <item
         android:id="@+id/settings"
         android:title="@string/preferences_action"