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