diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index ab54ed1f00..54a3b876d0 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -442,7 +442,8 @@ public class MessageHelper {
 
         // Send message
         if (identity != null) {
-            if (message.headers == null || !Boolean.TRUE.equals(message.resend)) {
+            if ((message.headers == null || !Boolean.TRUE.equals(message.resend)) &&
+                    (message.dsn == null || EntityMessage.DSN_NONE.equals(message.dsn))) {
                 // Add reply to
                 if (identity.replyto != null)
                     imessage.setReplyTo(convertAddress(InternetAddress.parse(identity.replyto), identity));