diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index 2227fbd36a7ec52d3b06a330b6e9ea9e320b76d2..3cfde53b9437d0eaa151cd5a6a17b9bfb51a93c8 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -45,7 +45,7 @@
                 android:id="@+id/message_content"
                 layout="@layout/message_content" />
 
-            <LinearLayout
+            <com.wefika.flowlayout.FlowLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="left"
@@ -103,7 +103,7 @@
                     android:gravity="center_vertical"
                     android:text="@string/sending"
                     android:textAppearance="@style/TextAppearance.Conversations.Caption" />
-            </LinearLayout>
+            </com.wefika.flowlayout.FlowLayout>
         </LinearLayout>
     </LinearLayout>
 
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index 3ca93c3b4d902fff3398fd60080b789ce292b617..5e665b1e6399366f14037fde62893f4fea5b4ed3 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -61,7 +61,7 @@
                 android:id="@+id/message_content"
                 layout="@layout/message_content" />
 
-            <LinearLayout
+            <com.wefika.flowlayout.FlowLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="right"
@@ -119,7 +119,7 @@
                     android:alpha="0.54"
                     android:gravity="center_vertical"
                     android:src="@drawable/ic_done_black_18dp" />
-            </LinearLayout>
+            </com.wefika.flowlayout.FlowLayout>
         </LinearLayout>
     </LinearLayout>