diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/SingleLineEmojiTextView.kt b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/SingleLineEmojiTextView.kt
new file mode 100644
index 0000000000..cf833c6ef2
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/SingleLineEmojiTextView.kt
@@ -0,0 +1,55 @@
+package org.thoughtcrime.securesms.components.emoji
+
+import android.content.Context
+import android.text.TextUtils
+import android.util.AttributeSet
+import androidx.appcompat.widget.AppCompatTextView
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.whispersystems.libsignal.util.guava.Optional
+
+open class SingleLineEmojiTextView @JvmOverloads constructor(
+  context: Context,
+  attrs: AttributeSet? = null,
+  defStyleAttr: Int = 0
+) : AppCompatTextView(context, attrs, defStyleAttr) {
+
+  private var bufferType: BufferType? = null
+
+  init {
+    maxLines = 1
+  }
+
+  override fun setText(text: CharSequence?, type: BufferType?) {
+    bufferType = type
+    val candidates = if (isInEditMode) null else EmojiProvider.getCandidates(text)
+    if (SignalStore.settings().isPreferSystemEmoji || candidates == null || candidates.size() == 0) {
+      super.setText(Optional.fromNullable(text).or(""), BufferType.NORMAL)
+    } else {
+      val newContent = if (width == 0) {
+        text
+      } else {
+        TextUtils.ellipsize(text, paint, width.toFloat(), TextUtils.TruncateAt.END, false, null)
+      }
+
+      val newCandidates = if (isInEditMode) null else EmojiProvider.getCandidates(newContent)
+      val newText = if (newCandidates == null || newCandidates.size() == 0) {
+        newContent
+      } else {
+        EmojiProvider.emojify(newCandidates, newContent, this)
+      }
+      super.setText(newText, type)
+    }
+  }
+
+  override fun onSizeChanged(width: Int, height: Int, oldWidth: Int, oldHeight: Int) {
+    super.onSizeChanged(width, height, oldWidth, oldHeight)
+    if (width > 0 && oldWidth != width) {
+      setText(text, bufferType ?: BufferType.NORMAL)
+    }
+  }
+
+  override fun setMaxLines(maxLines: Int) {
+    check(maxLines == 1) { "setMaxLines: $maxLines != 1" }
+    super.setMaxLines(maxLines)
+  }
+}
diff --git a/app/src/main/res/layout/conversation_list_item_view.xml b/app/src/main/res/layout/conversation_list_item_view.xml
index 5a53cfab19..e367dfbf3c 100644
--- a/app/src/main/res/layout/conversation_list_item_view.xml
+++ b/app/src/main/res/layout/conversation_list_item_view.xml
@@ -70,7 +70,7 @@
       app:layout_constraintStart_toStartOf="@id/conversation_list_item_name"
       tools:visibility="visible" />
 
-  <org.thoughtcrime.securesms.components.emoji.EmojiTextView
+  <org.thoughtcrime.securesms.components.emoji.SingleLineEmojiTextView
       android:id="@+id/conversation_list_item_summary"
       style="@style/Signal.Text.Preview"
       android:layout_width="0dp"
diff --git a/app/src/test/java/org/thoughtcrime/securesms/database/RecipientDatabaseTestUtils.kt b/app/src/test/java/org/thoughtcrime/securesms/database/RecipientDatabaseTestUtils.kt
index 6e64858c48..88aee1cb97 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/database/RecipientDatabaseTestUtils.kt
+++ b/app/src/test/java/org/thoughtcrime/securesms/database/RecipientDatabaseTestUtils.kt
@@ -63,7 +63,7 @@ object RecipientDatabaseTestUtils {
     mentionSetting: RecipientDatabase.MentionSetting = RecipientDatabase.MentionSetting.ALWAYS_NOTIFY,
     wallpaper: ChatWallpaper? = null,
     chatColors: ChatColors? = null,
-    avatarColor: AvatarColor = AvatarColor.BLUE,
+    avatarColor: AvatarColor = AvatarColor.A100,
     about: String? = null,
     aboutEmoji: String? = null,
     syncExtras: RecipientDatabase.RecipientSettings.SyncExtras = RecipientDatabase.RecipientSettings.SyncExtras(