Merge branch 'trunk'

class/deliver/Deliver.class.php

@@ -773,7 +773,7 @@ class Deliver {
             /* RFC 2298 */
             $header[] = 'Disposition-Notification-To: '.$dnt. $rn;
         }
-        if ($rfc822_header->dsn) {
+        if (isset($rfc822_header->dsn) && $rfc822_header->dsn) {
             $dsn = $rfc822_header->getAddr_s('dsn');
             $header[] = 'Return-Receipt-To: '.$dsn. $rn;
         }