diff --git a/app/src/main/java/eu/faircode/email/EntityAnswer.java b/app/src/main/java/eu/faircode/email/EntityAnswer.java
index 204409377c..5c3ebfa1a9 100644
--- a/app/src/main/java/eu/faircode/email/EntityAnswer.java
+++ b/app/src/main/java/eu/faircode/email/EntityAnswer.java
@@ -163,6 +163,8 @@ public class EntityAnswer implements Serializable {
             String username = UriHelper.getEmailUser(email);
             if (username != null) {
                 int dot = username.indexOf('.');
+                if (dot < 0)
+                    dot = username.indexOf('_');
                 if (dot < 0)
                     first = username;
                 else