diff --git a/app/src/main/java/eu/faircode/email/EntityAnswer.java b/app/src/main/java/eu/faircode/email/EntityAnswer.java
index 0846dd3ca2..80c93034ce 100644
--- a/app/src/main/java/eu/faircode/email/EntityAnswer.java
+++ b/app/src/main/java/eu/faircode/email/EntityAnswer.java
@@ -94,6 +94,20 @@ public class EntityAnswer implements Serializable {
             }
         }
 
+        if (fullName != null && !fullName.equals(first)) {
+            String[] parts = first.split("\\.");
+            if (parts != null && parts.length > 0) {
+                boolean initials = true;
+                for (String part : parts)
+                    if (part.trim().length() > 1) {
+                        initials = false;
+                        break;
+                    }
+                if (initials)
+                    first = null;
+            }
+        }
+
         text = text.replace("$name$", fullName == null ? "" : fullName);
         text = text.replace("$firstname$", first == null ? "" : first);
         text = text.replace("$lastname$", last == null ? "" : last);