diff --git a/res/layout-sw600dp/compose_area_buttons.xml b/res/layout-sw600dp/compose_area_buttons.xml
index f20297a3c..9c7ff2761 100644
--- a/res/layout-sw600dp/compose_area_buttons.xml
+++ b/res/layout-sw600dp/compose_area_buttons.xml
@@ -28,7 +28,6 @@
     <Button android:id="@+id/add_cc_bcc"
         android:text="@string/plus_cc_label"
         style="@style/ComposeButton"
-        android:visibility="gone"
         android:layout_marginLeft="16dip" />
 
     <ImageView android:id="@+id/add_attachment"
diff --git a/res/layout-sw600dp/message_compose.xml b/res/layout-sw600dp/message_compose.xml
index 12d02a8c0..78ddc742d 100644
--- a/res/layout-sw600dp/message_compose.xml
+++ b/res/layout-sw600dp/message_compose.xml
@@ -84,17 +84,16 @@
 
                 </FrameLayout>
 
-                <!--  quoted text bar -->
+                <RelativeLayout android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="100dip">
+                    <!--  quoted text bar -->
                     <LinearLayout
                         android:id="@+id/quoted_text_bar"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="vertical"
                         >
-                        <View
-                            android:layout_width="match_parent"
-                            style="@style/message_compose_horizontal_divider"
-                            />
                         <LinearLayout
                             android:orientation="horizontal"
                             android:layout_width="match_parent"
@@ -127,27 +126,17 @@
                                 android:gravity="center"
                                 />
                         </LinearLayout>
-                        <View
-                            android:layout_width="match_parent"
-                            style="@style/message_compose_horizontal_divider"
-                            />
                     </LinearLayout>
-                <!--
-                    Quoted text
-                    TODO: Don't put a webview in a scroll view.
-                -->
-                <WebView android:id="@+id/quoted_text"
-                    android:layout_height="wrap_content"
-                    android:layout_width="match_parent"
-                    android:layout_marginTop="16dip"
-                    />
-                <View
-                    android:id="@+id/tap_trap"
-                    android:layout_width="match_parent"
-                    android:layout_height="0dip"
-                    android:layout_weight="1"
-                    />
-
+                    <!--
+                        Quoted text
+                        TODO: Don't put a webview in a scroll view.
+                    -->
+                    <WebView android:id="@+id/quoted_text"
+                        android:layout_height="wrap_content"
+                        android:layout_width="match_parent"
+                        android:layout_marginTop="16dip"
+                        android:layout_below="@id/quoted_text_bar"/>
+                </RelativeLayout>
                 <FrameLayout
                   android:id="@+id/composearea_tap_trap_bottom"
                   android:layout_weight="1"
diff --git a/src/com/android/email/activity/MessageViewFragmentBase.java b/src/com/android/email/activity/MessageViewFragmentBase.java
index 3da44df0c..c3d28363a 100644
--- a/src/com/android/email/activity/MessageViewFragmentBase.java
+++ b/src/com/android/email/activity/MessageViewFragmentBase.java
@@ -292,7 +292,7 @@ public abstract class MessageViewFragmentBase extends Fragment implements View.O
         mFromAddressView = (TextView) UiUtilities.getView(view, R.id.from_address);
         mAddressesView = (TextView) UiUtilities.getView(view, R.id.addresses);
         mDateTimeView = (TextView) UiUtilities.getView(view, R.id.datetime);
-        mMessageContentView = (WebView) UiUtilities.getView(view, R.id.body_text);
+        mMessageContentView = (WebView) UiUtilities.getView(view, R.id.message_content);
         mAttachments = (LinearLayout) UiUtilities.getView(view, R.id.attachments);
         mTabSection = UiUtilities.getView(view, R.id.message_tabs_section);
         mFromBadge = (ImageView) UiUtilities.getView(view, R.id.badge);