diff --git a/res/layout/conversation_fragment.xml b/res/layout/conversation_fragment.xml
index d674edb10..20cafaa23 100644
--- a/res/layout/conversation_fragment.xml
+++ b/res/layout/conversation_fragment.xml
@@ -16,7 +16,7 @@
             android:clipChildren="false"
             android:clipToPadding="false"/>
 
-    <TextView
+    <org.thoughtcrime.securesms.components.emoji.EmojiTextView
         android:id="@+id/no_messages_text_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"