diff --git a/app/src/main/res/layout/call_participants_list_item.xml b/app/src/main/res/layout/call_participants_list_item.xml
index 7e90ef2df9..c6a7dc5173 100644
--- a/app/src/main/res/layout/call_participants_list_item.xml
+++ b/app/src/main/res/layout/call_participants_list_item.xml
@@ -18,7 +18,7 @@
         app:fallbackImageSize="small"
         tools:src="@tools:sample/avatars" />
 
-    <TextView
+    <org.thoughtcrime.securesms.components.emoji.EmojiTextView
         android:id="@+id/recipient_view_name"
         style="@style/TextAppearance.Signal.Body1"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/conversation_item_received_multimedia.xml b/app/src/main/res/layout/conversation_item_received_multimedia.xml
index eb6cf6c1fd..9f5de25378 100644
--- a/app/src/main/res/layout/conversation_item_received_multimedia.xml
+++ b/app/src/main/res/layout/conversation_item_received_multimedia.xml
@@ -77,7 +77,7 @@
                 android:visibility="gone"
                 tools:visibility="visible">
 
-                <TextView
+                <org.thoughtcrime.securesms.components.emoji.EmojiTextView
                     android:id="@+id/group_message_sender"
                     style="@style/Signal.Text.Preview"
                     android:layout_width="wrap_content"
@@ -90,7 +90,7 @@
                     tools:text="+14152222222"
                     tools:visibility="visible" />
 
-                <TextView
+                <org.thoughtcrime.securesms.components.emoji.EmojiTextView
                     android:id="@+id/group_message_sender_profile"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/conversation_item_received_text_only.xml b/app/src/main/res/layout/conversation_item_received_text_only.xml
index 245c4f88d8..aa1e77cf6e 100644
--- a/app/src/main/res/layout/conversation_item_received_text_only.xml
+++ b/app/src/main/res/layout/conversation_item_received_text_only.xml
@@ -77,7 +77,7 @@
                 android:visibility="gone"
                 tools:visibility="visible">
 
-                <TextView
+                <org.thoughtcrime.securesms.components.emoji.EmojiTextView
                     android:id="@+id/group_message_sender"
                     style="@style/Signal.Text.Preview"
                     android:layout_width="wrap_content"
@@ -90,7 +90,7 @@
                     tools:text="+14152222222"
                     tools:visibility="visible" />
 
-                <TextView
+                <org.thoughtcrime.securesms.components.emoji.EmojiTextView
                     android:id="@+id/group_message_sender_profile"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/mentions_picker_recipient_list_item.xml b/app/src/main/res/layout/mentions_picker_recipient_list_item.xml
index 61623988e8..4befd1d758 100644
--- a/app/src/main/res/layout/mentions_picker_recipient_list_item.xml
+++ b/app/src/main/res/layout/mentions_picker_recipient_list_item.xml
@@ -18,7 +18,7 @@
         app:fallbackImageSize="small"
         tools:src="@tools:sample/avatars" />
 
-    <TextView
+    <org.thoughtcrime.securesms.components.emoji.EmojiTextView
         android:id="@+id/recipient_view_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/recipient_bottom_sheet.xml b/app/src/main/res/layout/recipient_bottom_sheet.xml
index 18cf354d36..33a48385fc 100644
--- a/app/src/main/res/layout/recipient_bottom_sheet.xml
+++ b/app/src/main/res/layout/recipient_bottom_sheet.xml
@@ -28,7 +28,7 @@
         app:layout_constraintTop_toTopOf="@+id/rbs_recipient_avatar"
         tools:visibility="visible" />
 
-    <TextView
+    <org.thoughtcrime.securesms.components.emoji.EmojiTextView
         android:id="@+id/rbs_full_name"
         style="@style/TextAppearance.Signal.Body1.Bold"
         android:layout_width="wrap_content"
@@ -41,7 +41,7 @@
         app:layout_constraintTop_toBottomOf="@id/rbs_recipient_avatar"
         tools:text="Gwen Stacy" />
 
-    <TextView
+    <org.thoughtcrime.securesms.components.emoji.EmojiTextView
         android:id="@+id/rbs_username_number"
         style="@style/Signal.Text.Body"
         android:layout_width="wrap_content"