diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index d5ea618425..328b94fe17 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -1532,7 +1532,7 @@ public class MessageHelper {
             } else
                 formatted.add(addresses[i].toString());
         }
-        return TextUtils.join(", ", formatted);
+        return TextUtils.join(compose ? ", " : "; ", formatted);
     }
 
     static String punyCode(String email) {