From 2669dfa9361e8b4a370675c5a984e9e1422ec95a Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 16 Sep 2026 16:45:11 +0200
Subject: [PATCH] Prevent double extra replace

---
 app/src/main/java/eu/faircode/email/MessageHelper.java | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index c3ff2fd11d..28d9082c57 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -870,11 +870,6 @@ public class MessageHelper {
                 String email = ((InternetAddress) from).getAddress();
                 String user = UriHelper.getEmailUser(email);
                 String domain = UriHelper.getEmailDomain(email);
-                if (message.extra != null) {
-                    Pair<String, String> extra = getExtra(email, message.extra);
-                    if (extra.second != null)
-                        email = extra.second;
-                }
                 address = address
                         .replace("$from$", email)
                         .replace("$user$", user)