diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 054e75e710..ebeb88873f 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -3609,7 +3609,9 @@ public class MessageHelper {
                 String email = address.getAddress();
                 String personal = address.getPersonal();
 
-                if (TextUtils.isEmpty(personal) || format == AddressFormat.EMAIL_ONLY)
+                if (format == AddressFormat.EMAIL_ONLY ||
+                        TextUtils.isEmpty(personal) ||
+                        PatternsCompat.AUTOLINK_EMAIL_ADDRESS.matcher(personal).find())
                     formatted.add(TextUtils.isEmpty(email) ? "<>" : email);
                 else {
                     if (compose) {