diff --git a/app/src/main/res/layout/item_custom_incoming_text_message.xml b/app/src/main/res/layout/item_custom_incoming_text_message.xml
index 06f60829c..a6915b6a1 100644
--- a/app/src/main/res/layout/item_custom_incoming_text_message.xml
+++ b/app/src/main/res/layout/item_custom_incoming_text_message.xml
@@ -64,11 +64,20 @@
             app:layout_wrapBefore="true"
             tools:text="Talk to you later!" />
 
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:layout_marginStart="8dp"
+            android:gravity="end"
+            android:orientation="horizontal"
+            android:layout_below="@id/messageText"
+            app:layout_alignSelf="flex_end">
+
         <TextView
             android:id="@id/messageTime"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@id/messageText"
             android:layout_marginStart="8dp"
             android:alpha="0.6"
             android:textColor="@color/no_emphasis_text"
@@ -84,7 +93,6 @@
             android:id="@+id/messageEditIndicator"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@id/messageText"
             android:layout_marginStart="8dp"
             android:gravity="end"
             android:alpha="0.6"
@@ -95,6 +103,7 @@
             android:textSize="12sp">
 
         </TextView>
+        </LinearLayout>
 
         <include
             android:id="@+id/reactions"