diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 03576a6e99..c3ff2fd11d 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -865,12 +865,16 @@ public class MessageHelper {
 
     static String replacePlaceholders(String address, EntityMessage message, EntityIdentity identity) throws UnsupportedEncodingException {
         if (hasPlaceholder(address)) {
-            if (message.from != null &&
-                    message.from.length == 1 &&
-                    message.from[0] instanceof InternetAddress) {
-                String email = ((InternetAddress) message.from[0]).getAddress();
+            Address from = getFrom(message, identity);
+            if (from instanceof InternetAddress) {
+                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)