diff --git a/res/layout/message.xml b/res/layout/message.xml
index e506b85b2..86f42060b 100644
--- a/res/layout/message.xml
+++ b/res/layout/message.xml
@@ -9,7 +9,8 @@
 
     <com.fsck.k9.view.NonLockingScrollView
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="0dp"
+        android:layout_weight="1">
 
         <LinearLayout
             android:orientation="vertical"