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)