diff --git a/briar-android/src/main/res/layout/list_item_conversation_notice_in.xml b/briar-android/src/main/res/layout/list_item_conversation_notice_in.xml
index ae5e40cf0..2ab8cb207 100644
--- a/briar-android/src/main/res/layout/list_item_conversation_notice_in.xml
+++ b/briar-android/src/main/res/layout/list_item_conversation_notice_in.xml
@@ -5,11 +5,6 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:layout_marginBottom="@dimen/message_bubble_margin"
-	android:layout_marginEnd="@dimen/message_bubble_margin_non_tail"
-	android:layout_marginLeft="@dimen/message_bubble_margin_tail"
-	android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
-	android:layout_marginStart="@dimen/message_bubble_margin_tail"
 	android:layout_marginTop="@dimen/message_bubble_margin"
 	android:orientation="vertical">
 
@@ -18,6 +13,10 @@
 		style="@style/TextMessage"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
+		android:layout_marginEnd="@dimen/message_bubble_margin_non_tail"
+		android:layout_marginLeft="@dimen/message_bubble_margin_tail"
+		android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
+		android:layout_marginStart="@dimen/message_bubble_margin_tail"
 		android:background="@drawable/msg_in_top"
 		android:elevation="@dimen/message_bubble_elevation"
 		tools:text="Short message"/>
@@ -26,6 +25,11 @@
 		android:id="@+id/layout"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
+		android:layout_marginBottom="@dimen/message_bubble_margin"
+		android:layout_marginEnd="@dimen/message_bubble_margin_non_tail"
+		android:layout_marginLeft="@dimen/message_bubble_margin_tail"
+		android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
+		android:layout_marginStart="@dimen/message_bubble_margin_tail"
 		android:background="@drawable/notice_in_bottom"
 		android:elevation="@dimen/message_bubble_elevation">
 
diff --git a/briar-android/src/main/res/layout/list_item_conversation_notice_out.xml b/briar-android/src/main/res/layout/list_item_conversation_notice_out.xml
index 2b89b8499..a5730f872 100644
--- a/briar-android/src/main/res/layout/list_item_conversation_notice_out.xml
+++ b/briar-android/src/main/res/layout/list_item_conversation_notice_out.xml
@@ -5,11 +5,6 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:layout_marginBottom="@dimen/message_bubble_margin"
-	android:layout_marginEnd="@dimen/message_bubble_margin_tail"
-	android:layout_marginLeft="@dimen/message_bubble_margin_non_tail"
-	android:layout_marginRight="@dimen/message_bubble_margin_tail"
-	android:layout_marginStart="@dimen/message_bubble_margin_non_tail"
 	android:layout_marginTop="@dimen/message_bubble_margin"
 	android:orientation="vertical">
 
@@ -18,6 +13,10 @@
 		style="@style/TextMessage"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
+		android:layout_marginEnd="@dimen/message_bubble_margin_tail"
+		android:layout_marginLeft="@dimen/message_bubble_margin_non_tail"
+		android:layout_marginRight="@dimen/message_bubble_margin_tail"
+		android:layout_marginStart="@dimen/message_bubble_margin_non_tail"
 		android:background="@drawable/msg_out_top"
 		android:elevation="@dimen/message_bubble_elevation"
 		android:textColor="@color/briar_text_primary_inverse"
@@ -27,6 +26,11 @@
 		android:id="@+id/layout"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
+		android:layout_marginBottom="@dimen/message_bubble_margin"
+		android:layout_marginEnd="@dimen/message_bubble_margin_tail"
+		android:layout_marginLeft="@dimen/message_bubble_margin_non_tail"
+		android:layout_marginRight="@dimen/message_bubble_margin_tail"
+		android:layout_marginStart="@dimen/message_bubble_margin_non_tail"
 		android:background="@drawable/notice_out_bottom"
 		android:elevation="@dimen/message_bubble_elevation">
 
diff --git a/briar-android/src/main/res/layout/list_item_conversation_request.xml b/briar-android/src/main/res/layout/list_item_conversation_request.xml
index 72898c5aa..039202689 100644
--- a/briar-android/src/main/res/layout/list_item_conversation_request.xml
+++ b/briar-android/src/main/res/layout/list_item_conversation_request.xml
@@ -5,11 +5,6 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:layout_marginBottom="@dimen/message_bubble_margin"
-	android:layout_marginEnd="@dimen/message_bubble_margin_non_tail"
-	android:layout_marginLeft="@dimen/message_bubble_margin_tail"
-	android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
-	android:layout_marginStart="@dimen/message_bubble_margin_tail"
 	android:layout_marginTop="@dimen/message_bubble_margin"
 	android:orientation="vertical">
 
@@ -18,6 +13,10 @@
 		style="@style/TextMessage"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
+		android:layout_marginEnd="@dimen/message_bubble_margin_non_tail"
+		android:layout_marginLeft="@dimen/message_bubble_margin_tail"
+		android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
+		android:layout_marginStart="@dimen/message_bubble_margin_tail"
 		android:background="@drawable/msg_in_top"
 		android:elevation="@dimen/message_bubble_elevation"
 		android:textColor="?android:attr/textColorPrimary"
@@ -27,6 +26,11 @@
 		android:id="@+id/layout"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
+		android:layout_marginBottom="@dimen/message_bubble_margin"
+		android:layout_marginEnd="@dimen/message_bubble_margin_non_tail"
+		android:layout_marginLeft="@dimen/message_bubble_margin_tail"
+		android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
+		android:layout_marginStart="@dimen/message_bubble_margin_tail"
 		android:background="@drawable/notice_in_bottom"
 		android:elevation="@dimen/message_bubble_elevation">