diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index 7df8f42fdb05144e8a381d2b7e72d83c0f1ea44a..9d6c436d6f9dd73a46eb78c0db1fed90ac36cd6e 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -36,6 +36,7 @@
         android:minHeight="53dp">
 
         <LinearLayout
+            android:minWidth="110dp"
             android:layout_width="wrap_content"
             android:layout_height="fill_parent"
             android:gravity="center_vertical"
@@ -47,7 +48,7 @@
                 layout="@layout/message_content" />
 
             <com.wefika.flowlayout.FlowLayout
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="left"
                 android:orientation="horizontal"
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index b99faabb29cb9892038cf88878d08f958a160b7a..f857501d3855f8e12d45c440aa148ebca9425775 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -37,6 +37,7 @@
         android:minHeight="53dp">
 
         <LinearLayout
+            android:minWidth="110dp"
             android:layout_width="wrap_content"
             android:layout_height="fill_parent"
             android:gravity="center_vertical"
@@ -48,7 +49,7 @@
                 layout="@layout/message_content" />
 
             <com.wefika.flowlayout.FlowLayout
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="right"
                 android:orientation="horizontal"