From: pdontthink <pdontthink@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Wed, 29 Oct 2008 23:25:51 +0000 (+0000)
Subject: Properly construct Return-Receipt-To header
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=cc51047fc1b0a21a0491c34487661698567c2100;p=squirrelmail.git

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 37a2887c..ee7130d1 100644
--- 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']);
     }