Have the cc/bbc and attachment action on top with nice icons.

res/menu/message_compose_option.xml

@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
+	<item
+		android:id="@+id/add_cc_bcc"
+        android:alphabeticShortcut="c"
+		android:title="@string/add_cc_bcc_action"
+		android:icon="@drawable/ic_action_add_cc_bbc"
+		android:showAsAction="always"
+	/>
+	<item
+		android:id="@+id/add_attachment"
+        android:alphabeticShortcut="n"
+		android:title="@string/add_attachment_action"
+        android:icon="@drawable/ic_action_add_attachment"
+        android:showAsAction="always"
+    />
 	<item
 		android:id="@+id/send"
         android:alphabeticShortcut="s"
 		android:title="@string/send_action"
 		android:icon="@drawable/ic_action_send"
 		android:showAsAction="always"
-	/>
-	<item
-		android:id="@+id/add_cc_bcc"
-        android:alphabeticShortcut="c"
-		android:title="@string/add_cc_bcc_action"
-		android:icon="@drawable/ic_menu_cc"
-	/>
-	<item
-		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"

src/com/fsck/k9/activity/MessageCompose.java

@@ -282,6 +282,7 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
 
     private String mReferences;
     private String mInReplyTo;
+    private Menu mMenu;
 
     private boolean mSourceProcessed = false;
 
@@ -1783,6 +1784,7 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
     private void onAddCcBcc() {
         mCcWrapper.setVisibility(View.VISIBLE);
         mBccWrapper.setVisibility(View.VISIBLE);
+        mMenu.findItem(R.id.add_cc_bcc).setVisible(false);
     }
 
     private void onReadReceipt() {
@@ -2182,6 +2184,8 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
         super.onCreateOptionsMenu(menu);
         getSupportMenuInflater().inflate(R.menu.message_compose_option, menu);
 
+        mMenu = menu;
+
         // Disable the 'Save' menu option if Drafts folder is set to -NONE-
         if (!mAccount.hasDraftsFolder()) {
             menu.findItem(R.id.save).setEnabled(false);