diff --git a/app/src/main/res/layout/item_custom_incoming_preview_message.xml b/app/src/main/res/layout/item_custom_incoming_preview_message.xml
index 76f5af9c98..f9e82e7f84 100644
--- a/app/src/main/res/layout/item_custom_incoming_preview_message.xml
+++ b/app/src/main/res/layout/item_custom_incoming_preview_message.xml
@@ -40,6 +40,20 @@
         android:layout_marginEnd="6dp"
         android:contentDescription="@string/avatar" />
 
+    <androidx.emoji2.widget.EmojiTextView
+        android:id="@+id/messageAuthor"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_toEndOf="@id/messageUserAvatar"
+        android:layout_marginBottom="4dp"
+        android:alpha="0.6"
+        android:textAlignment="viewStart"
+        android:textColor="@color/no_emphasis_text"
+        android:textIsSelectable="false"
+        android:textSize="12sp"
+        tools:ignore="TextContrastCheck"
+        tools:text="Jane Doe" />
+
     <com.google.android.flexbox.FlexboxLayout
         android:id="@+id/incoming_preview_message_bubble"
         android:layout_width="wrap_content"
@@ -47,25 +61,13 @@
         android:layout_marginTop="8dp"
         android:layout_marginBottom="8dp"
         android:layout_toEndOf="@id/messageUserAvatar"
+        android:layout_below="@id/messageAuthor"
         android:orientation="vertical"
         app:alignContent="stretch"
         app:alignItems="stretch"
         app:flexWrap="wrap"
         app:justifyContent="flex_end">
 
-        <androidx.emoji2.widget.EmojiTextView
-            android:id="@+id/messageAuthor"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="4dp"
-            android:alpha="0.6"
-            android:textAlignment="viewStart"
-            android:textColor="@color/no_emphasis_text"
-            android:textIsSelectable="false"
-            android:textSize="12sp"
-            tools:ignore="TextContrastCheck"
-            tools:text="Jane Doe" />
-
         <FrameLayout
             android:id="@+id/preview_container"
             android:layout_width="wrap_content"