diff --git a/res/layout/contact_selection_list_item.xml b/res/layout/contact_selection_list_item.xml
index 93cd8aad53..cabe0b6800 100644
--- a/res/layout/contact_selection_list_item.xml
+++ b/res/layout/contact_selection_list_item.xml
@@ -48,7 +48,8 @@
 
     </LinearLayout>
 
-    <TextView android:id="@+id/name"
+    <org.thoughtcrime.securesms.components.emoji.EmojiTextView
+        android:id="@+id/name"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_above="@id/number_container"
diff --git a/res/layout/recipient_filter_item.xml b/res/layout/recipient_filter_item.xml
index 86eaeb3e52..4891ba185d 100644
--- a/res/layout/recipient_filter_item.xml
+++ b/res/layout/recipient_filter_item.xml
@@ -30,7 +30,8 @@
         android:layout_height="wrap_content"
         android:orientation="horizontal">
 
-        <TextView android:id="@+id/name"
+        <org.thoughtcrime.securesms.components.emoji.EmojiTextView
+            android:id="@+id/name"
             style="?android:attr/dropDownItemStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/res/layout/recipient_preference_activity.xml b/res/layout/recipient_preference_activity.xml
index 0c959f6808..7150aea747 100644
--- a/res/layout/recipient_preference_activity.xml
+++ b/res/layout/recipient_preference_activity.xml
@@ -32,7 +32,8 @@
                           android:orientation="vertical"
                           android:paddingLeft="10dp">
 
-                <TextView android:id="@+id/name"
+                <org.thoughtcrime.securesms.components.emoji.EmojiTextView
+                          android:id="@+id/name"
                           android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
                           android:ellipsize="end"