diff --git a/res/layout/contact_selection_list_item.xml b/res/layout/contact_selection_list_item.xml
index babfec749..c3cb93245 100644
--- a/res/layout/contact_selection_list_item.xml
+++ b/res/layout/contact_selection_list_item.xml
@@ -42,6 +42,9 @@
             android:fontFamily="sans-serif"
             android:textSize="16sp"
             tools:text="Frieeeeeeedrich Nieeeeeeeeeetzsche" />
+            <!-- Attention: Using android:maxLines="1", if the name is an emoji followed by a
+            long word and the chat is muted, then the long word is not shown at all
+            (instead of using `…`). That's why we use android:singleLine="true" -->
 
         <LinearLayout android:id="@+id/number_container"
                       android:orientation="horizontal"
diff --git a/res/layout/conversation_list_item_view.xml b/res/layout/conversation_list_item_view.xml
index bd9d8b66d..64adfba13 100644
--- a/res/layout/conversation_list_item_view.xml
+++ b/res/layout/conversation_list_item_view.xml
@@ -47,9 +47,12 @@
                 android:drawablePadding="5dp"
                 android:ellipsize="end"
                 android:fontFamily="sans-serif-medium"
-                android:maxLines="1"
+                android:singleLine="true"
                 android:textColor="?attr/conversation_list_item_contact_color"
                 tools:text="Jules Bonnot" />
+                <!-- Attention: Using android:maxLines="1", if the name is an emoji followed by a
+                long word and the chat is muted, then the long word is not shown at all
+                (instead of using `…`). That's why we use android:singleLine="true" -->
 
             <org.thoughtcrime.securesms.components.emoji.EmojiTextView
                 android:id="@+id/subject"
diff --git a/res/layout/conversation_title_view.xml b/res/layout/conversation_title_view.xml
index 5be271dcc..ec40d4d70 100644
--- a/res/layout/conversation_title_view.xml
+++ b/res/layout/conversation_title_view.xml
@@ -60,11 +60,14 @@
                 android:layout_height="wrap_content"
                 android:drawablePadding="5dp"
                 android:ellipsize="end"
-                android:maxLines="1"
+                android:singleLine="true"
                 android:textSize="20dp"
                 android:transitionName="recipient_name"
                 android:layout_weight="1"
                 tools:text="Jules Bonnot" />
+                <!-- Attention: Using android:maxLines="1", if the name is an emoji followed by a
+                long word and the chat is muted, then the long word is not shown at all
+                (instead of using `…`). That's why we use android:singleLine="true" -->
 
             <ImageView
                 android:id="@+id/ephemeral_icon"