diff --git a/src/org/thoughtcrime/securesms/components/RecipientsPanel.java b/src/org/thoughtcrime/securesms/components/RecipientsPanel.java
index 84c55c4c7d..a67b1c934c 100644
--- a/src/org/thoughtcrime/securesms/components/RecipientsPanel.java
+++ b/src/org/thoughtcrime/securesms/components/RecipientsPanel.java
@@ -69,7 +69,7 @@ public class RecipientsPanel extends RelativeLayout {
   }
 
   public void addRecipient(String name, String number) {
-    if (name != null) recipientsText.append(name + "< " + number + ">, ");
+    if (name != null) recipientsText.append(name.replace(",", " ") + "< " + number + ">, ");
     else              recipientsText.append(number + ", ");
   }