diff --git a/res/layout/conversation_title_view.xml b/res/layout/conversation_title_view.xml
index 1c5478874b..23d120b8c1 100644
--- a/res/layout/conversation_title_view.xml
+++ b/res/layout/conversation_title_view.xml
@@ -35,7 +35,8 @@
                    android:alpha="0.7"
                    android:visibility="gone"/>
 
-        <TextView android:id="@+id/subtitle"
+        <org.thoughtcrime.securesms.components.emoji.EmojiTextView
+                  android:id="@+id/subtitle"
                   android:layout_width="wrap_content"
                   android:layout_height="wrap_content"
                   android:singleLine="true"