diff --git a/res/menu/message_compose_option.xml b/res/menu/message_compose_option.xml
index 2d4c774e4..9b13bceec 100644
--- a/res/menu/message_compose_option.xml
+++ b/res/menu/message_compose_option.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
+	<item
+		android:id="@+id/send"
+        android:alphabeticShortcut="s"
+		android:title="@string/send_action"
+		android:icon="@drawable/ic_menu_send"
+	/>
 	<item
 		android:id="@+id/add_cc_bcc"
         android:alphabeticShortcut="c"
@@ -7,11 +13,11 @@
 		android:icon="@drawable/ic_menu_cc"
 	/>
 	<item
-		android:id="@+id/send"
-        android:alphabeticShortcut="s"
-		android:title="@string/send_action"
-		android:icon="@drawable/ic_menu_send"
-	/>
+		android:id="@+id/add_attachment"
+        android:alphabeticShortcut="n"
+		android:title="@string/add_attachment_action"
+        android:icon="@drawable/ic_menu_attachment"
+    />
 	<item
 		android:id="@+id/save"
         android:alphabeticShortcut="d"
@@ -24,10 +30,4 @@
 		android:title="@string/discard_action"
 		android:icon="@drawable/ic_menu_close_clear_cancel"
 	/>
-	<item
-		android:id="@+id/add_attachment"
-        android:alphabeticShortcut="n"
-		android:title="@string/add_attachment_action"
-		android:icon="@drawable/ic_menu_attachment"
-	/>
-</menu>
\ No newline at end of file
+</menu>
diff --git a/res/menu/message_view_option.xml b/res/menu/message_view_option.xml
index aefd06dff..9687a5601 100644
--- a/res/menu/message_view_option.xml
+++ b/res/menu/message_view_option.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/delete"
-        android:alphabeticShortcut="q"
-        android:title="@string/delete_action"
-        android:icon="@drawable/ic_menu_delete"
-    />
     <item
         android:id="@+id/forward"
         android:alphabeticShortcut="f"
@@ -30,4 +24,10 @@
         android:title="@string/mark_as_unread_action"
         android:icon="@drawable/ic_menu_mark"
     />
+    <item
+        android:id="@+id/delete"
+        android:alphabeticShortcut="q"
+        android:title="@string/delete_action"
+        android:icon="@drawable/ic_menu_delete"
+    />
 </menu>