diff --git a/src/org/thoughtcrime/securesms/ConversationListItem.java b/src/org/thoughtcrime/securesms/ConversationListItem.java
index 68515e4733..231de9c8ff 100644
--- a/src/org/thoughtcrime/securesms/ConversationListItem.java
+++ b/src/org/thoughtcrime/securesms/ConversationListItem.java
@@ -319,6 +319,8 @@ public class ConversationListItem extends RelativeLayout
                                      @Nullable String value,
                                      @Nullable String highlight)
   {
+    value = value != null ? value.replaceAll("\n", " ") : null;
+
     if (value == null || highlight == null) {
       return new SpannableString(value);
     }