diff --git a/app/build.gradle b/app/build.gradle
index 92773b9b5..4e91ee123 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -35,7 +35,7 @@ dependencies {
     implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
     implementation 'androidx.exifinterface:exifinterface:1.3.3'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
     implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycleVersion"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion"
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion"
diff --git a/app/src/main/res/layout/view_document.xml b/app/src/main/res/layout/view_document.xml
index c750ea62c..b4df80d3c 100644
--- a/app/src/main/res/layout/view_document.xml
+++ b/app/src/main/res/layout/view_document.xml
@@ -2,7 +2,7 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="horizontal"
diff --git a/app/src/main/res/layout/view_visible_message_content.xml b/app/src/main/res/layout/view_visible_message_content.xml
index 33b1735a0..56dd1e7e1 100644
--- a/app/src/main/res/layout/view_visible_message_content.xml
+++ b/app/src/main/res/layout/view_visible_message_content.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/mainContainerConstraint"
@@ -46,8 +46,9 @@
         android:layout_height="wrap_content"/>
     <org.thoughtcrime.securesms.conversation.v2.messages.DocumentView
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        tools:visibility="visible"
         android:visibility="gone"
         android:id="@+id/documentView"
         android:layout_width="wrap_content"
@@ -60,7 +61,6 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="@+id/albumThumbnailView"
         app:layout_constraintHorizontal_bias="0"
-        tools:visibility="visible"
         android:visibility="gone"
         android:id="@+id/quoteView"
         android:layout_width="wrap_content"
@@ -68,7 +68,6 @@
     <org.thoughtcrime.securesms.conversation.v2.messages.LinkPreviewView
         app:layout_constraintTop_toBottomOf="@+id/quoteView"
         app:layout_constraintStart_toStartOf="parent"
-        tools:visibility="visible"
         android:visibility="gone"
         android:id="@+id/linkPreviewView"
         android:layout_width="wrap_content"
@@ -91,7 +90,6 @@
         android:layout_height="wrap_content"/>
     <org.thoughtcrime.securesms.components.emoji.EmojiTextView
         app:layout_constraintHorizontal_bias="0"
-        tools:visibility="visible"
         android:visibility="gone"
         app:layout_constraintTop_toBottomOf="@+id/albumThumbnailView"
         app:layout_constraintStart_toStartOf="parent"