diff --git a/src/main/res/layout/item_message_received.xml b/src/main/res/layout/item_message_received.xml
index 43fc6a597..646664dcc 100644
--- a/src/main/res/layout/item_message_received.xml
+++ b/src/main/res/layout/item_message_received.xml
@@ -62,8 +62,7 @@
 
                 <include
                     android:id="@+id/message_content"
-                    layout="@layout/item_message_content"
-                    android:animateLayoutChanges="true" />
+                    layout="@layout/item_message_content" />
 
                 <com.wefika.flowlayout.FlowLayout
                     android:id="@+id/status_line"
@@ -160,8 +159,7 @@
             android:layout_height="0dp"
             android:layout_marginBottom="12dp"
             app:layout_constraintBottom_toBottomOf="@+id/message_box"
-            app:layout_constraintStart_toStartOf="@+id/message_box"
-            android:animateLayoutChanges="true" />
+            app:layout_constraintStart_toStartOf="@+id/message_box" />
 
         <com.google.android.material.chip.ChipGroup
             android:id="@+id/reactions"
@@ -177,8 +175,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintStart_toStartOf="@+id/message_box"
-            app:layout_constraintTop_toBottomOf="@+id/reactions_anchor"
-            android:animateLayoutChanges="true" />
+            app:layout_constraintTop_toBottomOf="@+id/reactions_anchor" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </com.daimajia.swipe.SwipeLayout>
 </layout>
\ No newline at end of file
diff --git a/src/main/res/layout/item_message_sent.xml b/src/main/res/layout/item_message_sent.xml
index f0431aecb..44e683c13 100644
--- a/src/main/res/layout/item_message_sent.xml
+++ b/src/main/res/layout/item_message_sent.xml
@@ -67,8 +67,7 @@
 
                 <include
                     android:id="@+id/message_content"
-                    layout="@layout/item_message_content"
-                    android:animateLayoutChanges="true" />
+                    layout="@layout/item_message_content" />
 
                 <com.wefika.flowlayout.FlowLayout
                     android:id="@+id/status_line"
@@ -156,8 +155,7 @@
             android:layout_height="0dp"
             android:layout_marginBottom="12dp"
             app:layout_constraintBottom_toBottomOf="@+id/message_box"
-            app:layout_constraintEnd_toEndOf="@+id/message_box"
-            android:animateLayoutChanges="true" />
+            app:layout_constraintEnd_toEndOf="@+id/message_box" />
 
         <com.google.android.material.chip.ChipGroup
             android:id="@+id/reactions"
@@ -173,8 +171,7 @@
             app:layout_constraintEnd_toEndOf="@+id/message_box"
             app:layout_constraintHorizontal_bias="1.0"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/reactions_anchor"
-            android:animateLayoutChanges="true" />
+            app:layout_constraintTop_toBottomOf="@+id/reactions_anchor" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </com.daimajia.swipe.SwipeLayout>
 </layout>
\ No newline at end of file