- Use empty envelope sender address for message disposition notifications (RFC2298.3)

CHANGELOG

@@ -20,6 +20,7 @@ CHANGELOG Roundcube Webmail
 - Improve tabs to fixed width and add tabs in identities info (#1486974)
 - Add unique index on users.username+users.mail_host
 - Make htmleditor option more consistent and add option to use HTML on reply to HTML message (#1485840)
+- Use empty envelope sender address for message disposition notifications (RFC2298.3)
 
 RELEASE 0.4.2
 -------------

program/include/rcube_smtp.php

@@ -195,6 +195,13 @@ class rcube_smtp
       return false;
     }
 
+    // RFC2298.3: remove envelope sender address
+    if (preg_match('/Content-Type: multipart\/report/', $text_headers)
+      && preg_match('/report-type=disposition-notification/', $text_headers)
+    ) {
+      $from = '';
+    }
+
     // set From: address
     if (PEAR::isError($this->conn->mailFrom($from)))
     {