From f32b70368ff41bf03ffad19a41c747a23c360056 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 26 Dec 2019 20:17:07 +0100
Subject: [PATCH] Remove name on extra

---
 app/src/main/java/eu/faircode/email/MessageHelper.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 8670b400bc..baa40f11f4 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -157,9 +157,15 @@ public class MessageHelper {
         if (message.from != null && message.from.length > 0) {
             String email = ((InternetAddress) message.from[0]).getAddress();
             String name = ((InternetAddress) message.from[0]).getPersonal();
-            if (email != null && identity != null && identity.sender_extra && !TextUtils.isEmpty(message.extra)) {
+            if (identity != null && identity.sender_extra &&
+                    identity.email.contains("@") &&
+                    email != null &&
+                    email.contains("@") &&
+                    message.extra != null &&
+                    !message.extra.equals(identity.email.split("@")[0])) {
                 int at = email.indexOf('@');
                 email = message.extra + email.substring(at);
+                name = null;
                 Log.i("extra=" + email);
             }
             imessage.setFrom(new InternetAddress(email, name));