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

git-svn-id: https://svn.roundcube.net/trunk@4055 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 7 insertions, 0 deletions

diff --git a/roundcubemail/program/include/rcube_smtp.php b/roundcubemail/program/include/rcube_smtp.php
index b45747661..61eebf3fa 100644
--- a/roundcubemail/program/include/rcube_smtp.php
+++ b/roundcubemail/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)))
     {