diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/AlbumThumbnailView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/AlbumThumbnailView.kt
index b8ac292903..c14c8fd662 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/AlbumThumbnailView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/AlbumThumbnailView.kt
@@ -54,7 +54,6 @@ class AlbumThumbnailView : FrameLayout {
         super.dispatchDraw(canvas)
         cornerMask.mask(canvas)
     }
-
     // endregion
 
     // region Interaction
diff --git a/app/src/main/res/layout/album_thumbnail_view.xml b/app/src/main/res/layout/album_thumbnail_view.xml
index a7e80b31f6..d9b566976d 100644
--- a/app/src/main/res/layout/album_thumbnail_view.xml
+++ b/app/src/main/res/layout/album_thumbnail_view.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout 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"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <FrameLayout
         android:id="@+id/albumCellContainer"
@@ -12,6 +12,10 @@
         />
 
     <ViewStub
+        android:layout_alignTop="@+id/albumCellContainer"
+        android:layout_alignStart="@+id/albumCellContainer"
+        android:layout_alignEnd="@+id/albumCellContainer"
+        android:layout_alignBottom="@+id/albumCellContainer"
         android:id="@+id/albumTransferControlsStub"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -19,11 +23,15 @@
         android:layout="@layout/transfer_controls_stub" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_alignTop="@+id/albumCellContainer"
+        android:layout_alignStart="@+id/albumCellContainer"
+        android:layout_alignEnd="@+id/albumCellContainer"
+        android:layout_alignBottom="@+id/albumCellContainer"
         tools:visibility="visible"
         android:visibility="gone"
         android:layout_gravity="bottom"
         android:id="@+id/albumCellBodyParent"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content">
         <ImageView
             android:id="@+id/albumCellShade"
@@ -69,4 +77,4 @@
             android:text="@string/ConversationItem_read_more"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</merge>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file