diff --git a/app/src/main/res/layout/longmessage_bubble_received.xml b/app/src/main/res/layout/longmessage_bubble_received.xml
index 78ef315477..ca7bb584fb 100644
--- a/app/src/main/res/layout/longmessage_bubble_received.xml
+++ b/app/src/main/res/layout/longmessage_bubble_received.xml
@@ -1,45 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    tools:viewBindingIgnore="true"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
     android:background="@drawable/message_bubble_background_received_alone"
+    android:orientation="vertical"
     android:visibility="gone"
+    tools:viewBindingIgnore="true"
     tools:visibility="visible">
 
     <org.thoughtcrime.securesms.components.emoji.EmojiTextView
         android:id="@+id/longmessage_text"
+        style="@style/Signal.Text.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/message_bubble_top_padding"
         android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+        android:layout_marginTop="@dimen/message_bubble_top_padding"
         android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
         android:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding"
-        style="@style/Signal.Text.Body"
         android:textColor="@color/signal_text_primary"
         android:textColorLink="@color/signal_text_primary"
+        app:emoji_renderSpoilers="true"
         app:scaleEmojis="true"
-        tools:text="With great power comes great responsibility."/>
+        tools:text="With great power comes great responsibility." />
 
     <org.thoughtcrime.securesms.components.ConversationItemFooter
         android:id="@+id/longmessage_footer"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="-4dp"
+        android:layout_gravity="end"
         android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+        android:layout_marginTop="-4dp"
         android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
         android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
-        android:layout_gravity="end"
+        android:alpha="0.7"
         android:clipChildren="false"
         android:clipToPadding="false"
-        android:alpha="0.7"
+        app:footer_icon_color="@color/signal_icon_tint_secondary"
         app:footer_mode="incoming"
-        app:footer_text_color="@color/signal_text_secondary"
         app:footer_reveal_dot_color="@color/signal_text_secondary"
-        app:footer_icon_color="@color/signal_icon_tint_secondary"/>
+        app:footer_text_color="@color/signal_text_secondary" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/longmessage_bubble_sent.xml b/app/src/main/res/layout/longmessage_bubble_sent.xml
index c8e11ab7a1..5a395a7cc9 100644
--- a/app/src/main/res/layout/longmessage_bubble_sent.xml
+++ b/app/src/main/res/layout/longmessage_bubble_sent.xml
@@ -1,44 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    tools:viewBindingIgnore="true"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
     android:background="@drawable/message_bubble_background_sent_alone"
+    android:orientation="vertical"
     android:visibility="gone"
+    tools:viewBindingIgnore="true"
     tools:visibility="visible">
 
     <org.thoughtcrime.securesms.components.emoji.EmojiTextView
         android:id="@+id/longmessage_text"
+        style="@style/Signal.Text.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/message_bubble_top_padding"
         android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+        android:layout_marginTop="@dimen/message_bubble_top_padding"
         android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
         android:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding"
-        style="@style/Signal.Text.Body"
         android:textColor="@color/conversation_item_sent_text_primary_color"
         android:textColorLink="@color/conversation_item_sent_text_primary_color"
+        app:emoji_renderSpoilers="true"
         app:scaleEmojis="true"
-        tools:text="With great power comes great responsibility."/>
+        tools:text="With great power comes great responsibility." />
 
     <org.thoughtcrime.securesms.components.ConversationItemFooter
         android:id="@+id/longmessage_footer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="-4dp"
+        android:layout_gravity="end"
         android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+        android:layout_marginTop="-4dp"
         android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
         android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
-        android:layout_gravity="end"
         android:clipChildren="false"
         android:clipToPadding="false"
+        app:footer_icon_color="@color/conversation_item_sent_text_secondary_color"
         app:footer_mode="outgoing"
-        app:footer_text_color="@color/conversation_item_sent_text_secondary_color"
         app:footer_reveal_dot_color="@color/conversation_item_sent_text_secondary_color"
-        app:footer_icon_color="@color/conversation_item_sent_text_secondary_color"/>
+        app:footer_text_color="@color/conversation_item_sent_text_secondary_color" />
 
 </LinearLayout>
\ No newline at end of file