diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationMessage.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationMessage.java
index e0026014a7..6464d9a948 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationMessage.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationMessage.java
@@ -98,7 +98,7 @@ public class ConversationMessage {
   }
 
   public @NonNull SpannableString getDisplayBody(Context context) {
-    return (body != null) ? body : messageRecord.getDisplayBody(context);
+    return (body != null) ? new SpannableString(body) : messageRecord.getDisplayBody(context);
   }
 
   public boolean hasStyleLinks() {