diff --git a/src/org/thoughtcrime/securesms/components/RecipientsPanel.java b/src/org/thoughtcrime/securesms/components/RecipientsPanel.java
index a67b1c934..40f29c520 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.replace(",", " ") + "< " + number + ">, ");
+    if (name != null) recipientsText.append(sanitizeRecipientName(name) + "< " + number + ">, ");
     else              recipientsText.append(number + ", ");
   }
 
@@ -149,6 +149,10 @@ public class RecipientsPanel extends RelativeLayout {
     recipientsText.setOnFocusChangeListener(new FocusChangedListener());
   }
 
+  private static String sanitizeRecipientName(String name) {
+    return name.replaceAll("[,<>]", "");
+  }
+
   private class FocusChangedListener implements View.OnFocusChangeListener {
     public void onFocusChange(View v, boolean hasFocus) {
       if (!hasFocus && (panelChangeListener != null)) {