Properly construct Return-Receipt-To header

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@13313 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/src/compose.php b/src/compose.php
index 37a2887c1127167e974167b211958b7d23d2e680..ee7130d1d873b6baea3e575510fc450635ac99f1 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -1523,7 +1523,7 @@ function deliverMessage(&$composeMessage, $draft=false) {
     /* Receipt: On Delivery */
     if (!empty($request_dr)) {
 //FIXME: it would be better to fiddle with headers inside of the message object or possibly when delivering the message to its destination; is this possible?
-        $rfc822_header->more_headers['Return-Receipt-To'] = $from->mailbox.'@'.$from->domain;
+        $rfc822_header->more_headers['Return-Receipt-To'] = $from_addr;
     } elseif (isset($rfc822_header->more_headers['Return-Receipt-To'])) {
         unset($rfc822_header->more_headers['Return-Receipt-To']);
     }