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 7cef2baf2..6b3cb435d 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
@@ -172,6 +172,7 @@
             android:layout_marginStart="8dp"
             android:layout_marginEnd="2dp"
             android:alpha="0.6"
+            android:gravity="end"
             android:textColor="@color/no_emphasis_text"
             app:layout_alignSelf="center"
             tools:text="12:38" />
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 defaf021c..9b548b9fb 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
@@ -85,9 +85,13 @@
             android:layout_below="@id/messageText"
             android:layout_marginStart="8dp"
             android:alpha="0.6"
+            android:gravity="end"
             android:textColor="@color/no_emphasis_text"
             android:textIsSelectable="false"
-            app:layout_alignSelf="center" />
+            app:layout_alignSelf="center"
+            app:layout_flexGrow="1"
+            app:layout_wrapBefore="false"
+            tools:text="12:38" />
 
         <include
             android:id="@+id/reactions"
diff --git a/app/src/main/res/layout/item_custom_outcoming_location_message.xml b/app/src/main/res/layout/item_custom_outcoming_location_message.xml
index bd5a0aa62..4d3ccbb56 100644
--- a/app/src/main/res/layout/item_custom_outcoming_location_message.xml
+++ b/app/src/main/res/layout/item_custom_outcoming_location_message.xml
@@ -70,6 +70,7 @@
             android:layout_below="@id/messageText"
             android:layout_marginStart="8dp"
             android:alpha="0.6"
+            android:gravity="end"
             android:textColor="@color/no_emphasis_text"
             app:layout_alignSelf="center"
             tools:text="10:35" />
diff --git a/app/src/main/res/layout/item_custom_outcoming_preview_message.xml b/app/src/main/res/layout/item_custom_outcoming_preview_message.xml
index 9293eaf9e..165e1c80c 100644
--- a/app/src/main/res/layout/item_custom_outcoming_preview_message.xml
+++ b/app/src/main/res/layout/item_custom_outcoming_preview_message.xml
@@ -152,7 +152,7 @@
             app:layout_alignSelf="flex_start"
             app:layout_flexGrow="1"
             app:layout_wrapBefore="true"
-            tools:text="Message" />
+            tools:text="A simple message" />
 
         <TextView
             android:id="@id/messageTime"
@@ -162,6 +162,7 @@
             android:layout_marginStart="8dp"
             android:layout_marginEnd="2dp"
             android:alpha="0.6"
+            android:gravity="end"
             android:textColor="@color/no_emphasis_text"
             app:layout_alignSelf="center"
             tools:text="12:34" />
diff --git a/app/src/main/res/layout/item_custom_outcoming_text_message.xml b/app/src/main/res/layout/item_custom_outcoming_text_message.xml
index fc10826d5..139b1b97c 100644
--- a/app/src/main/res/layout/item_custom_outcoming_text_message.xml
+++ b/app/src/main/res/layout/item_custom_outcoming_text_message.xml
@@ -64,9 +64,12 @@
             android:layout_below="@id/messageText"
             android:layout_marginStart="8dp"
             android:alpha="0.6"
+            android:gravity="end"
             android:textColor="@color/no_emphasis_text"
             android:textIsSelectable="false"
             app:layout_alignSelf="center"
+            app:layout_flexGrow="1"
+            app:layout_wrapBefore="false"
             tools:text="10:35" />
 
         <ImageView
diff --git a/app/src/main/res/layout/item_system_message.xml b/app/src/main/res/layout/item_system_message.xml
index dfaaff72d..db27523d1 100644
--- a/app/src/main/res/layout/item_system_message.xml
+++ b/app/src/main/res/layout/item_system_message.xml
@@ -47,10 +47,10 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerHorizontal="true"
+            android:layout_marginStart="@dimen/standard_margin"
+            android:layout_marginEnd="@dimen/standard_margin"
             android:gravity="center_horizontal"
             android:textAlignment="center"
-            android:layout_marginEnd="@dimen/standard_margin"
-            android:layout_marginStart="@dimen/standard_margin"
             android:textColor="@color/textColorMaxContrast"
             android:textSize="14sp"
             app:layout_alignSelf="flex_start"