From 5993960668d44470d35aa1a384f8a7ec4fc6c01d Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 3 Mar 2022 10:20:02 +0100 Subject: [PATCH] Borrow reply-to name only for same domain --- app/src/main/java/eu/faircode/email/Core.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java index 62143b718a..54f2ef7046 100644 --- a/app/src/main/java/eu/faircode/email/Core.java +++ b/app/src/main/java/eu/faircode/email/Core.java @@ -3966,11 +3966,14 @@ class Core { // Borrow reply name from sender name if (message.from != null && message.from.length == 1 && message.reply != null && message.reply.length == 1) { + InternetAddress from = (InternetAddress) message.from[0]; InternetAddress reply = (InternetAddress) message.reply[0]; - if (TextUtils.isEmpty(reply.getPersonal())) { - InternetAddress from = (InternetAddress) message.from[0]; + String from_domain = UriHelper.getEmailDomain(from.getAddress()); + String reply_domain = UriHelper.getEmailDomain(reply.getAddress()); + + if (TextUtils.isEmpty(reply.getPersonal()) && + Objects.equals(from_domain, reply_domain)) reply.setPersonal(from.getPersonal()); - } } EntityIdentity identity = matchIdentity(context, folder, message);