From ebf41cdc76697d2392ad7b2413b36892c8f76246 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 5 Sep 2018 07:39:05 +0000
Subject: [PATCH] Sanitize email name

---
 .../main/java/eu/faircode/email/MessageHelper.java    | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index e721dbd5cf..c50c55e252 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -268,10 +268,13 @@ public class MessageHelper {
                 String personal = a.getPersonal();
                 if (TextUtils.isEmpty(personal))
                     formatted.add(address.toString());
-                else if (full)
-                    formatted.add(personal + " <" + a.getAddress() + ">");
-                else
-                    formatted.add(personal);
+                else {
+                    personal = personal.replaceAll("[\\,\\<\\>]", "");
+                    if (full)
+                        formatted.add(personal + " <" + a.getAddress() + ">");
+                    else
+                        formatted.add(personal);
+                }
             } else
                 formatted.add(address.toString());
         return TextUtils.join(", ", formatted);