From 88b0a5a61643d3478e1474096be63300aa6aa819 Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 2 Nov 2019 10:14:48 +0100 Subject: [PATCH] Revert "Small improvement" This reverts commit 0fcd6b637c2bee6c37130dea4fb21eb32c2a3ff6. --- app/src/main/java/eu/faircode/email/MessageHelper.java | 6 ++---- 1 file changed, 2 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 e440187e7f..e7f4512e96 100644 --- a/app/src/main/java/eu/faircode/email/MessageHelper.java +++ b/app/src/main/java/eu/faircode/email/MessageHelper.java @@ -146,12 +146,10 @@ public class MessageHelper { imessage.addHeader("X-Correlation-ID", message.msgid); // Addresses - if (identity != null && identity.sender_extra && - !TextUtils.isEmpty(message.extra) && - message.from != null && message.from.length > 0) { + 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) { + if (email != null && identity != null && identity.sender_extra && !TextUtils.isEmpty(message.extra)) { int at = email.indexOf('@'); email = message.extra + email.substring(at); Log.i("extra=" + email);