diff --git a/res/drawable-hdpi/ic_menu_cc_holo_light.png b/res/drawable-hdpi/ic_menu_cc_holo_light.png
new file mode 100644
index 000000000..ef5899e27
Binary files /dev/null and b/res/drawable-hdpi/ic_menu_cc_holo_light.png differ
diff --git a/res/drawable-mdpi/ic_menu_cc_holo_light.png b/res/drawable-mdpi/ic_menu_cc_holo_light.png
new file mode 100644
index 000000000..2697982b7
Binary files /dev/null and b/res/drawable-mdpi/ic_menu_cc_holo_light.png differ
diff --git a/res/layout/message_compose.xml b/res/layout/message_compose.xml
index 132e07d63..dbb8b09cb 100644
--- a/res/layout/message_compose.xml
+++ b/res/layout/message_compose.xml
@@ -35,16 +35,29 @@
                     android:layout_height="wrap_content"
                     android:visibility="gone"
                     />
-                <com.android.email.activity.AddressTextView
-                    android:id="@+id/to" android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:textColor="?android:attr/textColorSecondary"
-                    android:layout_marginLeft="6dip"
-                    android:layout_marginRight="6dip"
-                    android:inputType="textEmailAddress|textMultiLine"
-                    android:imeOptions="actionNext"
-                    android:hint="@string/message_compose_to_hint" />
+
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <com.android.email.activity.AddressTextView
+                        android:id="@+id/to"
+                        android:layout_width="0dip"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:textColor="?android:attr/textColorSecondary"
+                        android:layout_marginLeft="6dip"
+                        android:layout_marginRight="6dip"
+                        android:inputType="textEmailAddress|textMultiLine"
+                        android:imeOptions="actionNext"
+                        android:hint="@string/message_compose_to_hint" />
+                    <ImageView
+                        android:id="@+id/add_cc_bcc"
+                        android:layout_height="wrap_content"
+                        android:layout_width="wrap_content"
+                        android:src="@drawable/ic_menu_cc_holo_light" />
+                </LinearLayout>
                 <LinearLayout
                     android:id="@+id/cc_bcc_container"
                     android:layout_width="match_parent"
@@ -75,18 +88,30 @@
                         android:hint="@string/message_compose_bcc_hint"
                         />
                 </LinearLayout>
-                <EditText android:id="@+id/subject"
+                <LinearLayout
+                    android:orientation="horizontal"
                     android:layout_width="match_parent"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:layout_height="wrap_content"
-                    android:textColor="?android:attr/textColorSecondary"
-                    android:layout_marginLeft="6dip"
-                    android:layout_marginRight="6dip"
-                    android:hint="@string/message_compose_subject_hint"
-                    android:inputType
-                        ="textEmailSubject|textAutoCorrect|textCapSentences|textMultiLine"
-                    android:imeOptions="actionNext"
-                    />
+                    android:layout_height="wrap_content">
+
+                    <EditText android:id="@+id/subject"
+                        android:layout_width="0dip"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:textColor="?android:attr/textColorSecondary"
+                        android:layout_marginLeft="6dip"
+                        android:layout_marginRight="6dip"
+                        android:hint="@string/message_compose_subject_hint"
+                        android:inputType
+                            ="textEmailSubject|textAutoCorrect|textCapSentences|textMultiLine"
+                        android:imeOptions="actionNext"
+                        />
+                    <ImageView
+                        android:id="@+id/add_attachment"
+                        android:layout_height="wrap_content"
+                        android:layout_width="wrap_content"
+                        android:src="@drawable/ic_attachment_holo_light" />
+                </LinearLayout>
                 <!--
                     Empty container for storing attachments. We'll stick
                     instances of message_compose_attachment.xml in here.
diff --git a/res/menu/message_compose_option.xml b/res/menu/message_compose_option.xml
index 140abf738..5beb1ef85 100644
--- a/res/menu/message_compose_option.xml
+++ b/res/menu/message_compose_option.xml
@@ -30,16 +30,6 @@
         android:showAsAction="ifRoom"
         android:alphabeticShortcut="d"
     />
-    <item
-        android:id="@+id/add_cc_bcc"
-        android:title="@string/add_cc_bcc_action"
-        android:showAsAction="ifRoom"
-    />
-    <item
-        android:id="@+id/add_attachment"
-        android:icon="@drawable/ic_attachment_holo_light"
-        android:showAsAction="ifRoom"
-    />
     <item
         android:id="@+id/discard"
         android:title="@string/discard_action"
diff --git a/src/com/android/email/activity/MessageCompose.java b/src/com/android/email/activity/MessageCompose.java
index 9bd1d6aa8..0da3470ab 100644
--- a/src/com/android/email/activity/MessageCompose.java
+++ b/src/com/android/email/activity/MessageCompose.java
@@ -580,14 +580,11 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
         mBccView.setTokenizer(new Rfc822Tokenizer());
         mBccView.setValidator(addressValidator);
 
-        final View addCcBccView = findViewById(R.id.add_cc_bcc); // xlarge only
-        if (addCcBccView != null) {
-            addCcBccView.setOnClickListener(this);
-        }
-        final View addAttachmentView = findViewById(R.id.add_attachment); // xlarge only
-        if (addAttachmentView != null) {
-            addAttachmentView.setOnClickListener(this);
-        }
+        final View addCcBccView = UiUtilities.getView(this, R.id.add_cc_bcc);
+        addCcBccView.setOnClickListener(this);
+
+        final View addAttachmentView = UiUtilities.getView(this, R.id.add_attachment);
+        addAttachmentView.setOnClickListener(this);
 
         setFocusShifter(R.id.to_label, R.id.to);
         setFocusShifter(R.id.cc_label, R.id.cc);