diff --git a/app/src/main/res/layout/item_conversation.xml b/app/src/main/res/layout/item_conversation.xml
index d746f99ec..1d6eab67c 100644
--- a/app/src/main/res/layout/item_conversation.xml
+++ b/app/src/main/res/layout/item_conversation.xml
@@ -203,188 +203,7 @@
         app:layout_constraintTop_toBottomOf="@id/button_toggle_content"
         tools:visibility="gone">
 
-        <com.keylesspalace.tusky.view.MediaPreviewImageView
-            android:id="@+id/status_media_preview_0"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/status_media_preview_height"
-            android:scaleType="centerCrop"
-            app:layout_constraintEnd_toStartOf="@+id/status_media_preview_1"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:ignore="ContentDescription" />
-
-        <com.keylesspalace.tusky.view.MediaPreviewImageView
-            android:id="@+id/status_media_preview_1"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/status_media_preview_height"
-            android:layout_marginStart="4dp"
-            android:scaleType="centerCrop"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/status_media_preview_0"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:ignore="ContentDescription" />
-
-        <com.keylesspalace.tusky.view.MediaPreviewImageView
-            android:id="@+id/status_media_preview_2"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/status_media_preview_height"
-            android:layout_marginTop="4dp"
-            android:scaleType="centerCrop"
-            app:layout_constraintEnd_toStartOf="@+id/status_media_preview_3"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/status_media_preview_0"
-            tools:ignore="ContentDescription" />
-
-        <com.keylesspalace.tusky.view.MediaPreviewImageView
-            android:id="@+id/status_media_preview_3"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/status_media_preview_height"
-            android:layout_marginStart="4dp"
-            android:layout_marginTop="4dp"
-            android:background="@drawable/media_preview_outline"
-            android:scaleType="centerCrop"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/status_media_preview_2"
-            app:layout_constraintTop_toBottomOf="@+id/status_media_preview_1"
-            tools:ignore="ContentDescription" />
-
-        <ImageView
-            android:id="@+id/status_media_overlay_0"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:scaleType="center"
-            app:layout_constraintBottom_toBottomOf="@+id/status_media_preview_0"
-            app:layout_constraintEnd_toEndOf="@+id/status_media_preview_0"
-            app:layout_constraintStart_toStartOf="@+id/status_media_preview_0"
-            app:layout_constraintTop_toTopOf="@+id/status_media_preview_0"
-            app:srcCompat="@drawable/ic_play_indicator"
-            tools:ignore="ContentDescription" />
-
-        <ImageView
-            android:id="@+id/status_media_overlay_1"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:scaleType="center"
-            app:layout_constraintBottom_toBottomOf="@+id/status_media_preview_1"
-            app:layout_constraintEnd_toEndOf="@+id/status_media_preview_1"
-            app:layout_constraintStart_toStartOf="@+id/status_media_preview_1"
-            app:layout_constraintTop_toTopOf="@+id/status_media_preview_1"
-            app:srcCompat="@drawable/ic_play_indicator"
-            tools:ignore="ContentDescription" />
-
-        <ImageView
-            android:id="@+id/status_media_overlay_2"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:scaleType="center"
-            app:layout_constraintBottom_toBottomOf="@+id/status_media_preview_2"
-            app:layout_constraintEnd_toEndOf="@+id/status_media_preview_2"
-            app:layout_constraintStart_toStartOf="@+id/status_media_preview_2"
-            app:layout_constraintTop_toTopOf="@+id/status_media_preview_2"
-            app:srcCompat="@drawable/ic_play_indicator"
-            tools:ignore="ContentDescription" />
-
-        <ImageView
-            android:id="@+id/status_media_overlay_3"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:scaleType="center"
-            app:layout_constraintBottom_toBottomOf="@+id/status_media_preview_3"
-            app:layout_constraintEnd_toEndOf="@+id/status_media_preview_3"
-            app:layout_constraintStart_toStartOf="@+id/status_media_preview_3"
-            app:layout_constraintTop_toTopOf="@+id/status_media_preview_3"
-            app:srcCompat="@drawable/ic_play_indicator"
-            tools:ignore="ContentDescription" />
-
-        <ImageView
-            android:id="@+id/status_sensitive_media_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:alpha="0.7"
-            android:contentDescription="@null"
-            android:padding="@dimen/status_sensitive_media_button_padding"
-            android:visibility="gone"
-            app:layout_constraintLeft_toLeftOf="@+id/status_media_preview_container"
-            app:layout_constraintTop_toTopOf="@+id/status_media_preview_container"
-            app:srcCompat="@drawable/ic_eye_24dp"
-            app:tint="@color/white" />
-
-        <TextView
-            android:id="@+id/status_sensitive_media_warning"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@drawable/media_warning_bg"
-            android:gravity="center"
-            android:lineSpacingMultiplier="1.2"
-            android:orientation="vertical"
-            android:paddingLeft="12dp"
-            android:paddingTop="8dp"
-            android:paddingRight="12dp"
-            android:paddingBottom="8dp"
-            android:textAlignment="center"
-            android:textColor="?android:attr/textColorSecondary"
-            android:textSize="?attr/status_text_medium"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/status_media_label_0"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="?attr/selectableItemBackground"
-            android:drawablePadding="4dp"
-            android:gravity="center_vertical"
-            android:importantForAccessibility="no"
-            android:textSize="?attr/status_text_medium"
-            android:visibility="gone"
-            app:drawableTint="?android:attr/textColorTertiary"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/status_media_label_1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="?attr/selectableItemBackground"
-            android:drawablePadding="4dp"
-            android:gravity="center_vertical"
-            android:importantForAccessibility="no"
-            android:textSize="?attr/status_text_medium"
-            android:visibility="gone"
-            app:drawableTint="?android:attr/textColorTertiary"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/status_media_label_0" />
-
-        <TextView
-            android:id="@+id/status_media_label_2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="?attr/selectableItemBackground"
-            android:drawablePadding="4dp"
-            android:gravity="center_vertical"
-            android:importantForAccessibility="no"
-            android:textSize="?attr/status_text_medium"
-            android:visibility="gone"
-            app:drawableTint="?android:attr/textColorTertiary"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/status_media_label_1" />
-
-        <TextView
-            android:id="@+id/status_media_label_3"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="?attr/selectableItemBackground"
-            android:drawablePadding="4dp"
-            android:gravity="center_vertical"
-            android:importantForAccessibility="no"
-            android:textSize="?attr/status_text_medium"
-            android:visibility="gone"
-            app:drawableTint="?android:attr/textColorTertiary"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/status_media_label_2" />
+        <include layout="@layout/item_media_preview" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/item_media_preview.xml b/app/src/main/res/layout/item_media_preview.xml
new file mode 100644
index 000000000..27b58e7a1
--- /dev/null
+++ b/app/src/main/res/layout/item_media_preview.xml
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
+
+        <com.keylesspalace.tusky.view.MediaPreviewImageView
+            android:id="@+id/status_media_preview_0"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/status_media_preview_height"
+            android:scaleType="centerCrop"
+            app:layout_constraintEnd_toStartOf="@+id/status_media_preview_1"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:ignore="ContentDescription" />
+
+        <com.keylesspalace.tusky.view.MediaPreviewImageView
+            android:id="@+id/status_media_preview_1"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/status_media_preview_height"
+            android:layout_marginStart="4dp"
+            android:scaleType="centerCrop"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/status_media_preview_0"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:ignore="ContentDescription" />
+
+        <com.keylesspalace.tusky.view.MediaPreviewImageView
+            android:id="@+id/status_media_preview_2"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/status_media_preview_height"
+            android:layout_marginTop="4dp"
+            android:scaleType="centerCrop"
+            app:layout_constraintEnd_toStartOf="@+id/status_media_preview_3"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/status_media_preview_0"
+            tools:ignore="ContentDescription" />
+
+        <com.keylesspalace.tusky.view.MediaPreviewImageView
+            android:id="@+id/status_media_preview_3"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/status_media_preview_height"
+            android:layout_marginStart="4dp"
+            android:layout_marginTop="4dp"
+            android:background="@drawable/media_preview_outline"
+            android:scaleType="centerCrop"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/status_media_preview_2"
+            app:layout_constraintTop_toBottomOf="@+id/status_media_preview_1"
+            tools:ignore="ContentDescription" />
+
+        <ImageView
+            android:id="@+id/status_media_overlay_0"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:scaleType="center"
+            app:layout_constraintBottom_toBottomOf="@+id/status_media_preview_0"
+            app:layout_constraintEnd_toEndOf="@+id/status_media_preview_0"
+            app:layout_constraintStart_toStartOf="@+id/status_media_preview_0"
+            app:layout_constraintTop_toTopOf="@+id/status_media_preview_0"
+            app:srcCompat="@drawable/ic_play_indicator"
+            tools:ignore="ContentDescription" />
+
+        <ImageView
+            android:id="@+id/status_media_overlay_1"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:scaleType="center"
+            app:layout_constraintBottom_toBottomOf="@+id/status_media_preview_1"
+            app:layout_constraintEnd_toEndOf="@+id/status_media_preview_1"
+            app:layout_constraintStart_toStartOf="@+id/status_media_preview_1"
+            app:layout_constraintTop_toTopOf="@+id/status_media_preview_1"
+            app:srcCompat="@drawable/ic_play_indicator"
+            tools:ignore="ContentDescription" />
+
+        <ImageView
+            android:id="@+id/status_media_overlay_2"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:scaleType="center"
+            app:layout_constraintBottom_toBottomOf="@+id/status_media_preview_2"
+            app:layout_constraintEnd_toEndOf="@+id/status_media_preview_2"
+            app:layout_constraintStart_toStartOf="@+id/status_media_preview_2"
+            app:layout_constraintTop_toTopOf="@+id/status_media_preview_2"
+            app:srcCompat="@drawable/ic_play_indicator"
+            tools:ignore="ContentDescription" />
+
+        <ImageView
+            android:id="@+id/status_media_overlay_3"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:scaleType="center"
+            app:layout_constraintBottom_toBottomOf="@+id/status_media_preview_3"
+            app:layout_constraintEnd_toEndOf="@+id/status_media_preview_3"
+            app:layout_constraintStart_toStartOf="@+id/status_media_preview_3"
+            app:layout_constraintTop_toTopOf="@+id/status_media_preview_3"
+            app:srcCompat="@drawable/ic_play_indicator"
+            tools:ignore="ContentDescription" />
+
+        <ImageView
+            android:id="@+id/status_sensitive_media_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:alpha="0.7"
+            android:contentDescription="@null"
+            android:padding="@dimen/status_sensitive_media_button_padding"
+            android:visibility="gone"
+            app:layout_constraintLeft_toLeftOf="@+id/status_media_preview_container"
+            app:layout_constraintTop_toTopOf="@+id/status_media_preview_container"
+            app:srcCompat="@drawable/ic_eye_24dp"
+            app:tint="@color/white" />
+
+        <TextView
+            android:id="@+id/status_sensitive_media_warning"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@drawable/media_warning_bg"
+            android:gravity="center"
+            android:lineSpacingMultiplier="1.2"
+            android:orientation="vertical"
+            android:paddingLeft="12dp"
+            android:paddingTop="8dp"
+            android:paddingRight="12dp"
+            android:paddingBottom="8dp"
+            android:textAlignment="center"
+            android:textColor="?android:attr/textColorSecondary"
+            android:textSize="?attr/status_text_medium"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/status_media_label_0"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="?attr/selectableItemBackground"
+            android:drawablePadding="4dp"
+            android:gravity="center_vertical"
+            android:importantForAccessibility="no"
+            android:textSize="?attr/status_text_medium"
+            android:visibility="gone"
+            app:drawableTint="?android:attr/textColorTertiary"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/status_media_label_1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="?attr/selectableItemBackground"
+            android:drawablePadding="4dp"
+            android:gravity="center_vertical"
+            android:importantForAccessibility="no"
+            android:textSize="?attr/status_text_medium"
+            android:visibility="gone"
+            app:drawableTint="?android:attr/textColorTertiary"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/status_media_label_0" />
+
+        <TextView
+            android:id="@+id/status_media_label_2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="?attr/selectableItemBackground"
+            android:drawablePadding="4dp"
+            android:gravity="center_vertical"
+            android:importantForAccessibility="no"
+            android:textSize="?attr/status_text_medium"
+            android:visibility="gone"
+            app:drawableTint="?android:attr/textColorTertiary"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/status_media_label_1" />
+
+        <TextView
+            android:id="@+id/status_media_label_3"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="?attr/selectableItemBackground"
+            android:drawablePadding="4dp"
+            android:gravity="center_vertical"
+            android:importantForAccessibility="no"
+            android:textSize="?attr/status_text_medium"
+            android:visibility="gone"
+            app:drawableTint="?android:attr/textColorTertiary"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/status_media_label_2" />
+
+</merge>
diff --git a/app/src/main/res/layout/item_status.xml b/app/src/main/res/layout/item_status.xml
index b6c597254..8edca2e1a 100644
--- a/app/src/main/res/layout/item_status.xml
+++ b/app/src/main/res/layout/item_status.xml
@@ -257,192 +257,8 @@
         app:layout_constraintStart_toStartOf="@id/status_display_name"
         app:layout_constraintTop_toBottomOf="@id/status_card_view"
         tools:visibility="visible">
-
-        <com.keylesspalace.tusky.view.MediaPreviewImageView
-            android:id="@+id/status_media_preview_0"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/status_media_preview_height"
-            android:scaleType="centerCrop"
-            app:layout_constraintEnd_toStartOf="@+id/status_media_preview_1"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:ignore="ContentDescription" />
-
-        <com.keylesspalace.tusky.view.MediaPreviewImageView
-            android:id="@+id/status_media_preview_1"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/status_media_preview_height"
-            android:layout_marginStart="4dp"
-            android:scaleType="centerCrop"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/status_media_preview_0"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:ignore="ContentDescription" />
-
-
-        <com.keylesspalace.tusky.view.MediaPreviewImageView
-            android:id="@+id/status_media_preview_2"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/status_media_preview_height"
-            android:layout_marginTop="4dp"
-            android:scaleType="centerCrop"
-            app:layout_constraintEnd_toStartOf="@+id/status_media_preview_3"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/status_media_preview_0"
-            tools:ignore="ContentDescription" />
-
-        <com.keylesspalace.tusky.view.MediaPreviewImageView
-            android:id="@+id/status_media_preview_3"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/status_media_preview_height"
-            android:layout_marginStart="4dp"
-            android:layout_marginTop="4dp"
-            android:scaleType="centerCrop"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/status_media_preview_2"
-            app:layout_constraintTop_toBottomOf="@+id/status_media_preview_1"
-            tools:ignore="ContentDescription" />
-
-        <ImageView
-            android:id="@+id/status_media_overlay_0"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:scaleType="center"
-            app:layout_constraintBottom_toBottomOf="@+id/status_media_preview_0"
-            app:layout_constraintEnd_toEndOf="@+id/status_media_preview_0"
-            app:layout_constraintStart_toStartOf="@+id/status_media_preview_0"
-            app:layout_constraintTop_toTopOf="@+id/status_media_preview_0"
-            app:srcCompat="@drawable/ic_play_indicator"
-            tools:ignore="ContentDescription" />
-
-        <ImageView
-            android:id="@+id/status_media_overlay_1"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:scaleType="center"
-            app:layout_constraintBottom_toBottomOf="@+id/status_media_preview_1"
-            app:layout_constraintEnd_toEndOf="@+id/status_media_preview_1"
-            app:layout_constraintStart_toStartOf="@+id/status_media_preview_1"
-            app:layout_constraintTop_toTopOf="@+id/status_media_preview_1"
-            app:srcCompat="@drawable/ic_play_indicator"
-            tools:ignore="ContentDescription" />
-
-        <ImageView
-            android:id="@+id/status_media_overlay_2"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:scaleType="center"
-            app:layout_constraintBottom_toBottomOf="@+id/status_media_preview_2"
-            app:layout_constraintEnd_toEndOf="@+id/status_media_preview_2"
-            app:layout_constraintStart_toStartOf="@+id/status_media_preview_2"
-            app:layout_constraintTop_toTopOf="@+id/status_media_preview_2"
-            app:srcCompat="@drawable/ic_play_indicator"
-            tools:ignore="ContentDescription" />
-
-        <ImageView
-            android:id="@+id/status_media_overlay_3"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:scaleType="center"
-            app:layout_constraintBottom_toBottomOf="@+id/status_media_preview_3"
-            app:layout_constraintEnd_toEndOf="@+id/status_media_preview_3"
-            app:layout_constraintStart_toStartOf="@+id/status_media_preview_3"
-            app:layout_constraintTop_toTopOf="@+id/status_media_preview_3"
-            app:srcCompat="@drawable/ic_play_indicator"
-            tools:ignore="ContentDescription" />
-
-        <ImageView
-            android:id="@+id/status_sensitive_media_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:alpha="0.7"
-            android:contentDescription="@null"
-            android:padding="@dimen/status_sensitive_media_button_padding"
-            android:visibility="gone"
-            app:layout_constraintLeft_toLeftOf="@+id/status_media_preview_container"
-            app:layout_constraintTop_toTopOf="@+id/status_media_preview_container"
-            app:srcCompat="@drawable/ic_eye_24dp"
-            app:tint="@color/white" />
-
-        <TextView
-            android:id="@+id/status_sensitive_media_warning"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@drawable/media_warning_bg"
-            android:gravity="center"
-            android:importantForAccessibility="no"
-            android:lineSpacingMultiplier="1.2"
-            android:orientation="vertical"
-            android:paddingLeft="12dp"
-            android:paddingTop="8dp"
-            android:paddingRight="12dp"
-            android:paddingBottom="8dp"
-            android:textAlignment="center"
-            android:textColor="?android:attr/textColorSecondary"
-            android:textSize="?attr/status_text_medium"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:text="@string/status_sensitive_media_title"
-            tools:visibility="visible" />
-
-        <TextView
-            android:id="@+id/status_media_label_0"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="?attr/selectableItemBackground"
-            android:drawablePadding="4dp"
-            android:gravity="center_vertical"
-            android:importantForAccessibility="no"
-            android:textSize="?attr/status_text_medium"
-            android:visibility="gone"
-            app:drawableTint="?android:attr/textColorTertiary"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/status_media_label_1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="?attr/selectableItemBackground"
-            android:drawablePadding="4dp"
-            android:gravity="center_vertical"
-            android:importantForAccessibility="no"
-            android:textSize="?attr/status_text_medium"
-            android:visibility="gone"
-            app:drawableTint="?android:attr/textColorTertiary"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/status_media_label_0" />
-
-        <TextView
-            android:id="@+id/status_media_label_2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="?attr/selectableItemBackground"
-            android:drawablePadding="4dp"
-            android:gravity="center_vertical"
-            android:importantForAccessibility="no"
-            android:textSize="?attr/status_text_medium"
-            android:visibility="gone"
-            app:drawableTint="?android:attr/textColorTertiary"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/status_media_label_1" />
-
-        <TextView
-            android:id="@+id/status_media_label_3"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="?attr/selectableItemBackground"
-            android:drawablePadding="4dp"
-            android:gravity="center_vertical"
-            android:importantForAccessibility="no"
-            android:textSize="?attr/status_text_medium"
-            android:visibility="gone"
-            app:drawableTint="?android:attr/textColorTertiary"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/status_media_label_2" />
+        
+        <include layout="@layout/item_media_preview" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/item_status_detailed.xml b/app/src/main/res/layout/item_status_detailed.xml
index f3ad6ed52..a075503e5 100644
--- a/app/src/main/res/layout/item_status_detailed.xml
+++ b/app/src/main/res/layout/item_status_detailed.xml
@@ -206,189 +206,7 @@
         android:importantForAccessibility="noHideDescendants"
         app:layout_constraintTop_toBottomOf="@id/status_card_view">
 
-        <com.keylesspalace.tusky.view.MediaPreviewImageView
-            android:id="@+id/status_media_preview_0"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/status_media_preview_height"
-            android:scaleType="centerCrop"
-            app:layout_constraintEnd_toStartOf="@+id/status_media_preview_1"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:ignore="ContentDescription" />
-
-        <com.keylesspalace.tusky.view.MediaPreviewImageView
-            android:id="@+id/status_media_preview_1"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/status_media_preview_height"
-            android:layout_marginStart="4dp"
-            android:scaleType="centerCrop"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/status_media_preview_0"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:ignore="ContentDescription" />
-
-        <com.keylesspalace.tusky.view.MediaPreviewImageView
-            android:id="@+id/status_media_preview_2"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/status_media_preview_height"
-            android:layout_marginTop="4dp"
-            android:scaleType="centerCrop"
-            app:layout_constraintEnd_toStartOf="@+id/status_media_preview_3"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/status_media_preview_0"
-            tools:ignore="ContentDescription" />
-
-        <com.keylesspalace.tusky.view.MediaPreviewImageView
-            android:id="@+id/status_media_preview_3"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/status_media_preview_height"
-            android:layout_marginStart="4dp"
-            android:layout_marginTop="4dp"
-            android:scaleType="centerCrop"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/status_media_preview_2"
-            app:layout_constraintTop_toBottomOf="@+id/status_media_preview_1"
-            tools:ignore="ContentDescription" />
-
-        <ImageView
-            android:id="@+id/status_media_overlay_0"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:scaleType="center"
-            app:layout_constraintBottom_toBottomOf="@+id/status_media_preview_0"
-            app:layout_constraintEnd_toEndOf="@+id/status_media_preview_0"
-            app:layout_constraintStart_toStartOf="@+id/status_media_preview_0"
-            app:layout_constraintTop_toTopOf="@+id/status_media_preview_0"
-            app:srcCompat="@drawable/ic_play_indicator"
-            tools:ignore="ContentDescription" />
-
-        <ImageView
-            android:id="@+id/status_media_overlay_1"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:scaleType="center"
-            app:layout_constraintBottom_toBottomOf="@+id/status_media_preview_1"
-            app:layout_constraintEnd_toEndOf="@+id/status_media_preview_1"
-            app:layout_constraintStart_toStartOf="@+id/status_media_preview_1"
-            app:layout_constraintTop_toTopOf="@+id/status_media_preview_1"
-            app:srcCompat="@drawable/ic_play_indicator"
-            tools:ignore="ContentDescription" />
-
-        <ImageView
-            android:id="@+id/status_media_overlay_2"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:scaleType="center"
-            app:layout_constraintBottom_toBottomOf="@+id/status_media_preview_2"
-            app:layout_constraintEnd_toEndOf="@+id/status_media_preview_2"
-            app:layout_constraintStart_toStartOf="@+id/status_media_preview_2"
-            app:layout_constraintTop_toTopOf="@+id/status_media_preview_2"
-            app:srcCompat="@drawable/ic_play_indicator"
-            tools:ignore="ContentDescription" />
-
-        <ImageView
-            android:id="@+id/status_media_overlay_3"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:scaleType="center"
-            app:layout_constraintBottom_toBottomOf="@+id/status_media_preview_3"
-            app:layout_constraintEnd_toEndOf="@+id/status_media_preview_3"
-            app:layout_constraintStart_toStartOf="@+id/status_media_preview_3"
-            app:layout_constraintTop_toTopOf="@+id/status_media_preview_3"
-            app:srcCompat="@drawable/ic_play_indicator"
-            tools:ignore="ContentDescription" />
-
-        <ImageView
-            android:id="@+id/status_sensitive_media_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:alpha="0.7"
-            android:contentDescription="@string/action_hide_media"
-            android:padding="@dimen/status_sensitive_media_button_padding"
-            android:visibility="gone"
-            app:layout_constraintLeft_toLeftOf="@+id/status_media_preview_container"
-            app:layout_constraintTop_toTopOf="@+id/status_media_preview_container"
-            app:srcCompat="@drawable/ic_eye_24dp"
-            app:tint="@color/white" />
-
-        <TextView
-            android:id="@+id/status_sensitive_media_warning"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@drawable/media_warning_bg"
-            android:gravity="center"
-            android:lineSpacingMultiplier="1.2"
-            android:orientation="vertical"
-            android:paddingLeft="12dp"
-            android:paddingTop="8dp"
-            android:paddingRight="12dp"
-            android:paddingBottom="8dp"
-            android:textAlignment="center"
-            android:textColor="?android:attr/textColorSecondary"
-            android:textSize="?attr/status_text_medium"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:text="@string/status_sensitive_media_title"
-            tools:visibility="visible" />
-
-        <TextView
-            android:id="@+id/status_media_label_0"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="?attr/selectableItemBackground"
-            android:drawablePadding="4dp"
-            android:gravity="center_vertical"
-            android:importantForAccessibility="no"
-            android:textSize="?attr/status_text_medium"
-            android:visibility="gone"
-            app:drawableTint="?android:attr/textColorTertiary"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/status_media_label_1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="?attr/selectableItemBackground"
-            android:drawablePadding="4dp"
-            android:gravity="center_vertical"
-            android:importantForAccessibility="no"
-            android:textSize="?attr/status_text_medium"
-            android:visibility="gone"
-            app:drawableTint="?android:attr/textColorTertiary"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/status_media_label_0" />
-
-        <TextView
-            android:id="@+id/status_media_label_2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="?attr/selectableItemBackground"
-            android:drawablePadding="4dp"
-            android:gravity="center_vertical"
-            android:importantForAccessibility="no"
-            android:textSize="?attr/status_text_medium"
-            android:visibility="gone"
-            app:drawableTint="?android:attr/textColorTertiary"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/status_media_label_1" />
-
-        <TextView
-            android:id="@+id/status_media_label_3"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="?attr/selectableItemBackground"
-            android:drawablePadding="4dp"
-            android:gravity="center_vertical"
-            android:importantForAccessibility="no"
-            android:textSize="?attr/status_text_medium"
-            android:visibility="gone"
-            app:drawableTint="?android:attr/textColorTertiary"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/status_media_label_2" />
+        <include layout="@layout/item_media_preview" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -588,4 +406,4 @@
         app:layout_constraintTop_toTopOf="@id/status_reply"
         app:srcCompat="@drawable/ic_more_horiz_24dp" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>