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 e6e0bf944..06f60829c 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
@@ -74,7 +74,7 @@
             android:textColor="@color/no_emphasis_text"
             android:textIsSelectable="false"
             android:gravity = "end"
-            app:layout_alignSelf="center"
+            app:layout_alignSelf="flex_end"
             app:layout_flexGrow="1"
             app:layout_wrapBefore="false"
             tools:text="12:38" />
@@ -86,10 +86,11 @@
             android:layout_height="wrap_content"
             android:layout_below="@id/messageText"
             android:layout_marginStart="8dp"
+            android:gravity="end"
             android:alpha="0.6"
             android:textColor="@color/no_emphasis_text"
             android:textIsSelectable="false"
-            app:layout_alignSelf="center"
+            app:layout_alignSelf="flex_end"
             android:text = "@string/hint_edited_message"
             android:textSize="12sp">
 
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 711367f4b..ec70f5e47 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
@@ -53,7 +53,8 @@
             android:gravity="end"
             android:textColor="@color/no_emphasis_text"
             android:textIsSelectable="false"
-            app:layout_alignSelf="center"
+            app:layout_alignSelf="flex_end"
+            android:layout_gravity="end"
             app:layout_flexGrow="1"
             app:layout_wrapBefore="false"
             tools:text="10:35" />
@@ -67,7 +68,8 @@
             android:alpha="0.6"
             android:textColor="@color/no_emphasis_text"
             android:textIsSelectable="false"
-            app:layout_alignSelf="center"
+            android:gravity="end"
+            app:layout_alignSelf="flex_end"
             android:text = "@string/hint_edited_message"
             android:textSize="12sp">
 
@@ -80,7 +82,8 @@
             android:layout_below="@id/messageTime"
             android:layout_marginStart="8dp"
             android:contentDescription="@null"
-            app:layout_alignSelf="center"
+            app:layout_alignSelf="flex_end"
+            android:gravity="end"
             app:tint="@color/high_emphasis_text"
             tools:src="@drawable/ic_check_all" />