diff --git a/app/k9mail/src/main/res/values/themes.xml b/app/k9mail/src/main/res/values/themes.xml
index 5d7ec01439a6aee711e63840eacd40ba96738bba..4b40b2ef3d95882fbd3a0d6f5e471a43b37a021d 100644
--- a/app/k9mail/src/main/res/values/themes.xml
+++ b/app/k9mail/src/main/res/values/themes.xml
@@ -101,7 +101,7 @@
         <item name="messageStar">@drawable/btn_check_star</item>
         <item name="messageViewBackgroundColor">@color/color_default_background</item>
         <item name="messageComposeAddContactImage">@drawable/ic_person_plus</item>
-        <item name="attachmentCardBackground">#e8e8e8</item>
+        <item name="attachmentCardBackground">@color/color_default_foreground</item>
         <item name="contactPictureFallbackDefaultBackgroundColor">#ffababab</item>
         <item name="contactTokenBackgroundColor">#ccc</item>
         <item name="composerBackgroundColor">@android:color/background_light</item>
@@ -226,7 +226,7 @@
         <item name="messageStar">@drawable/btn_check_star</item>
         <item name="messageViewBackgroundColor">@color/color_default_background</item>
         <item name="messageComposeAddContactImage">@drawable/ic_person_plus</item>
-        <item name="attachmentCardBackground">#e8e8e8</item>
+        <item name="attachmentCardBackground">@color/color_default_foreground</item>
         <item name="contactPictureFallbackDefaultBackgroundColor">#ffababab</item>
         <item name="contactTokenBackgroundColor">#ccc</item>
         <item name="composerBackgroundColor">@android:color/background_light</item>
diff --git a/app/ui/legacy/src/main/res/layout/message_compose_content.xml b/app/ui/legacy/src/main/res/layout/message_compose_content.xml
index e6a44a3e0e030348a80a3581768edd4e639f2597..58c3ce9d4b5b1b42a7568cd62b3fdb9348cae998 100644
--- a/app/ui/legacy/src/main/res/layout/message_compose_content.xml
+++ b/app/ui/legacy/src/main/res/layout/message_compose_content.xml
@@ -87,21 +87,6 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content">
 
-            <EditText
-                android:id="@+id/quoted_text"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:gravity="top"
-                android:minLines="3"
-                android:inputType="textMultiLine|textAutoCorrect|textCapSentences"
-                android:imeOptions="flagNoExtractUi"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
-
-            <com.fsck.k9.view.MessageWebView
-                android:id="@+id/quoted_html"
-                android:layout_height="wrap_content"
-                android:layout_width="fill_parent" />
-
             <LinearLayout
                 android:id="@+id/quoted_text_buttons"
                 android:layout_width="wrap_content"
@@ -123,9 +108,25 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:background="@drawable/btn_dialog" />
-
             </LinearLayout>
 
+            <EditText
+                android:id="@+id/quoted_text"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:gravity="top"
+                android:layout_below="@id/quoted_text_buttons"
+                android:imeOptions="flagNoExtractUi"
+                android:inputType="textMultiLine|textAutoCorrect|textCapSentences"
+                android:minLines="3"
+                android:textAppearance="?android:attr/textAppearanceMedium" />
+
+            <com.fsck.k9.view.MessageWebView
+                android:id="@+id/quoted_html"
+                android:layout_height="wrap_content"
+                android:layout_width="fill_parent"
+                android:layout_below="@id/quoted_text_buttons"/>
+
         </RelativeLayout>
 
         <EditText