diff --git a/src/main/res/layout/message_content.xml b/src/main/res/layout/message_content.xml
new file mode 100644
index 000000000..bffac4bd9
--- /dev/null
+++ b/src/main/res/layout/message_content.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <ImageView
+        android:id="@+id/message_image"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="4dp"
+        android:layout_marginTop="8dp"
+        android:adjustViewBounds="true"
+        android:background="@color/black87"
+        android:longClickable="true"
+        android:scaleType="centerCrop"/>
+
+    <eu.siacs.conversations.ui.widget.CopyTextView
+        android:id="@+id/message_body"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:autoLink="web"
+        android:longClickable="true"
+        android:textColor="?attr/color_text_primary"
+        android:textColorHighlight="@color/grey500"
+        android:textColorLink="@color/black87"
+        android:textSize="?attr/TextSizeBody"/>
+
+    <Button
+        android:id="@+id/download_button"
+        style="?android:attr/buttonStyleSmall"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:longClickable="true"
+        android:visibility="gone"/>
+</merge>
\ No newline at end of file
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index ea098b2dc..0cf320b1d 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -38,35 +38,7 @@
             android:orientation="vertical"
             android:padding="2dp">
 
-            <ImageView
-                android:id="@+id/message_image"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:layout_marginBottom="4dp"
-                android:adjustViewBounds="true"
-                android:longClickable="true"
-                android:background="@color/black87"
-                android:scaleType="centerCrop" />
-
-            <eu.siacs.conversations.ui.widget.CopyTextView
-                android:id="@+id/message_body"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:autoLink="web"
-                android:longClickable="true"
-                android:textColorLink="@color/white"
-                android:textColor="@color/white"
-                android:textColorHighlight="@color/grey800"
-                android:textSize="?attr/TextSizeBody" />
-
-            <Button
-                android:id="@+id/download_button"
-                style="?android:attr/buttonStyleSmall"
-                android:longClickable="true"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:visibility="gone" />
+            <include layout="@layout/message_content"/>
 
             <LinearLayout
                 android:layout_width="wrap_content"
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index 0f81c3f7d..dfa8c91f9 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -39,35 +39,7 @@
             android:orientation="vertical"
             android:padding="2dp">
 
-            <ImageView
-                android:id="@+id/message_image"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:layout_marginBottom="4dp"
-                android:adjustViewBounds="true"
-                android:background="@color/black87"
-                android:longClickable="true"
-                android:scaleType="centerCrop" />
-
-            <eu.siacs.conversations.ui.widget.CopyTextView
-                android:id="@+id/message_body"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:autoLink="web"
-                android:longClickable="true"
-                android:textColorLink="@color/black87"
-                android:textColor="?attr/color_text_primary"
-                android:textColorHighlight="@color/grey500"
-                android:textSize="?attr/TextSizeBody" />
-
-            <Button
-                android:id="@+id/download_button"
-                style="?android:attr/buttonStyleSmall"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:longClickable="true"
-                android:visibility="gone" />
+            <include layout="@layout/message_content"/>
 
             <LinearLayout
                 android:layout_width="wrap_content"