diff --git a/app/src/main/res/layout/item_message_received.xml b/app/src/main/res/layout/item_message_received.xml
index 642080e19..fcd7a6cf6 100644
--- a/app/src/main/res/layout/item_message_received.xml
+++ b/app/src/main/res/layout/item_message_received.xml
@@ -43,8 +43,10 @@
                 android:padding="8dp"
                 android:visibility="@{message.hasInReplyTo ? View.VISIBLE : View.GONE}"
                 app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintWidth_min="wrap"
                 tools:visibility="visible">
 
                 <TextView
@@ -70,6 +72,8 @@
                     tools:text="11:23 PM" />
 
                 <TextView
+                    android:maxLines="@integer/embedded_message_max_lines"
+                    android:ellipsize="end"
                     android:id="@+id/embeddedMessageText"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -120,6 +124,7 @@
                 android:visibility="@{message.hasTextContent ? View.VISIBLE : View.GONE}"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/downloadButton">
 
diff --git a/app/src/main/res/layout/item_message_sent.xml b/app/src/main/res/layout/item_message_sent.xml
index f8557e104..0deaeb8b2 100644
--- a/app/src/main/res/layout/item_message_sent.xml
+++ b/app/src/main/res/layout/item_message_sent.xml
@@ -32,8 +32,10 @@
                 android:padding="8dp"
                 android:visibility="@{message.hasInReplyTo ? View.VISIBLE : View.GONE}"
                 app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintWidth_min="wrap"
                 tools:visibility="visible">
 
                 <TextView
@@ -63,6 +65,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="4sp"
+                    android:ellipsize="end"
+                    android:maxLines="@integer/embedded_message_max_lines"
                     android:text="@{message.inReplyToTextContent}"
                     android:textAppearance="?textAppearanceBodySmall"
                     android:textColor="?colorOnPrimaryContainer"
@@ -109,6 +113,7 @@
                 android:visibility="@{message.hasTextContent ? View.VISIBLE : View.GONE}"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/downloadButton">
 
diff --git a/app/src/main/res/values/message-bubbles.xml b/app/src/main/res/values/message-bubbles.xml
index 38b2b1aca..992d11a55 100644
--- a/app/src/main/res/values/message-bubbles.xml
+++ b/app/src/main/res/values/message-bubbles.xml
@@ -8,4 +8,5 @@
          always be restricted to max_preview_width. -->
     <dimen name="message_preview_max_width">384dp</dimen>
     <dimen name="message_preview_max_height">256dp</dimen>
+    <integer name="embedded_message_max_lines">3</integer>
 </resources>
\ No newline at end of file