diff --git a/res/layout/message_details_activity.xml b/res/layout/message_details_activity.xml
index d091ef6ce3..88cfb1061f 100644
--- a/res/layout/message_details_activity.xml
+++ b/res/layout/message_details_activity.xml
@@ -6,19 +6,9 @@
               android:layout_width="match_parent"
               android:layout_height="match_parent">
 
-    <FrameLayout android:id="@+id/item_container"
-                 android:layout_width="match_parent"
-                 android:layout_height="wrap_content"
-                 android:background="?conversation_background"
-                 android:paddingTop="15dp"
-                 android:paddingBottom="15dp"
-                 android:elevation="2dp" />
-
     <ListView android:id="@+id/recipients_list"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
-              android:paddingLeft="10dp"
-              android:paddingRight="10dp"
               tools:listitem="@layout/message_recipient_list_item" />
 
 </LinearLayout>
diff --git a/res/layout/message_details_header.xml b/res/layout/message_details_header.xml
index b0617bdfe3..730f8b8cbf 100644
--- a/res/layout/message_details_header.xml
+++ b/res/layout/message_details_header.xml
@@ -6,89 +6,105 @@
               android:layout_width="match_parent"
               android:layout_height="match_parent">
 
-    <TextView android:id="@+id/error_text"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:visibility="gone"
-              android:textSize="16sp"
-              android:padding="5dp"
-              tools:visibility="visible"
-              android:text="@string/message_details_header__issues_need_your_attention"
-              android:drawableLeft="@drawable/ic_info_outline_light"
-              android:drawableStart="@drawable/ic_info_outline_light"
-              android:gravity="center_vertical" />
-
-    <TableLayout android:id="@+id/metadata_container"
+    <FrameLayout android:id="@+id/item_container"
                  android:layout_width="match_parent"
-                 android:layout_height="match_parent">
+                 android:layout_height="wrap_content"
+                 android:background="?conversation_background"
+                 android:paddingTop="15dp"
+                 android:paddingBottom="15dp"
+                 android:elevation="2dp" />
 
-        <TableRow android:id="@+id/sent_container"
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingLeft="10dp"
+        android:paddingRight="10dp">
+
+        <TextView android:id="@+id/error_text"
                   android:layout_width="match_parent"
                   android:layout_height="wrap_content"
-                  android:padding="@dimen/message_details_table_row_pad">
+                  android:visibility="gone"
+                  android:textSize="16sp"
+                  android:padding="5dp"
+                  tools:visibility="visible"
+                  android:text="@string/message_details_header__issues_need_your_attention"
+                  android:drawableLeft="@drawable/ic_info_outline_light"
+                  android:drawableStart="@drawable/ic_info_outline_light"
+                  android:gravity="center_vertical" />
 
-            <TextView android:layout_width="wrap_content"
+        <TableLayout android:id="@+id/metadata_container"
+                     android:layout_width="match_parent"
+                     android:layout_height="match_parent">
+
+            <TableRow android:id="@+id/sent_container"
+                      android:layout_width="match_parent"
                       android:layout_height="wrap_content"
-                      android:text="@string/message_details_header__sent"
-                      android:gravity="right"
-                      android:textStyle="bold" />
+                      android:padding="@dimen/message_details_table_row_pad">
 
-            <TextView android:id="@+id/sent_time"
-                      android:layout_width="wrap_content"
+                <TextView android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:text="@string/message_details_header__sent"
+                          android:gravity="right"
+                          android:textStyle="bold" />
+
+                <TextView android:id="@+id/sent_time"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:layout_marginLeft="@dimen/message_details_table_row_pad"
+                          tools:text="Jan 18, 9:29AM" />
+
+            </TableRow>
+
+            <TableRow android:id="@+id/received_container"
+                      android:layout_width="match_parent"
                       android:layout_height="wrap_content"
-                      android:layout_marginLeft="@dimen/message_details_table_row_pad"
-                      tools:text="Jan 18, 9:29AM" />
+                      android:padding="@dimen/message_details_table_row_pad">
 
-        </TableRow>
+                <TextView android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:text="@string/message_details_header__received"
+                          android:gravity="right"
+                          android:textStyle="bold" />
 
-        <TableRow android:id="@+id/received_container"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:padding="@dimen/message_details_table_row_pad">
+                <TextView android:id="@+id/received_time"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:layout_marginLeft="@dimen/message_details_table_row_pad"
+                          tools:text="Jan 18, 9:31AM" />
 
-            <TextView android:layout_width="wrap_content"
+            </TableRow>
+
+            <TableRow android:layout_width="wrap_content"
                       android:layout_height="wrap_content"
-                      android:text="@string/message_details_header__received"
-                      android:gravity="right"
-                      android:textStyle="bold" />
+                      android:padding="@dimen/message_details_table_row_pad">
 
-            <TextView android:id="@+id/received_time"
-                      android:layout_width="wrap_content"
+                <TextView android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:text="@string/message_details_header__via"
+                          android:gravity="right"
+                          android:textStyle="bold" />
+
+                <TextView android:id="@+id/transport"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:layout_marginLeft="@dimen/message_details_table_row_pad"
+                          tools:text="Push (TextSecure)" />
+
+            </TableRow>
+
+            <TableRow android:layout_width="wrap_content"
                       android:layout_height="wrap_content"
-                      android:layout_marginLeft="@dimen/message_details_table_row_pad"
-                      tools:text="Jan 18, 9:31AM" />
+                      android:padding="@dimen/message_details_table_row_pad">
 
-        </TableRow>
+                <TextView android:id="@+id/tofrom"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          tools:text="@string/message_details_header__to"
+                          android:textStyle="bold" />
 
-        <TableRow android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:padding="@dimen/message_details_table_row_pad">
+            </TableRow>
 
-            <TextView android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:text="@string/message_details_header__via"
-                      android:gravity="right"
-                      android:textStyle="bold" />
-
-            <TextView android:id="@+id/transport"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:layout_marginLeft="@dimen/message_details_table_row_pad"
-                      tools:text="Push (TextSecure)" />
-
-        </TableRow>
-
-        <TableRow android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:padding="@dimen/message_details_table_row_pad">
-
-            <TextView android:id="@+id/tofrom"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      tools:text="@string/message_details_header__to"
-                      android:textStyle="bold" />
-
-        </TableRow>
-
-    </TableLayout>
-    </LinearLayout>
\ No newline at end of file
+        </TableLayout>
+    </LinearLayout>
+</LinearLayout>
diff --git a/res/layout/message_recipient_list_item.xml b/res/layout/message_recipient_list_item.xml
index 16a1a96925..40b99cf3e1 100644
--- a/res/layout/message_recipient_list_item.xml
+++ b/res/layout/message_recipient_list_item.xml
@@ -5,7 +5,9 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:gravity="center_vertical"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:paddingLeft="10dp"
+    android:paddingRight="10dp">
 
     <com.makeramen.RoundedImageView
             android:id="@+id/contact_photo_image"
diff --git a/src/org/thoughtcrime/securesms/MessageDetailsActivity.java b/src/org/thoughtcrime/securesms/MessageDetailsActivity.java
index 3748028ea4..9c4370b3c6 100644
--- a/src/org/thoughtcrime/securesms/MessageDetailsActivity.java
+++ b/src/org/thoughtcrime/securesms/MessageDetailsActivity.java
@@ -112,7 +112,7 @@ public class MessageDetailsActivity extends PassphraseRequiredActionBarActivity
 
     masterSecret      = getIntent().getParcelableExtra(MASTER_SECRET_EXTRA);
     isPushGroup       = getIntent().getBooleanExtra(IS_PUSH_GROUP_EXTRA, false);
-    itemParent        = (ViewGroup) findViewById(R.id.item_container );
+    itemParent        = (ViewGroup) header.findViewById(R.id.item_container);
     recipientsList    = (ListView ) findViewById(R.id.recipients_list);
     metadataContainer =             header.findViewById(R.id.metadata_container);
     errorText         = (TextView ) header.findViewById(R.id.error_text);