From 7ed4fba5cbd7493ea54a10c3bd2d183842d4e85b Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Fri, 23 Sep 2016 13:41:26 +0200
Subject: [PATCH] Change Errors-To and envelope-from see BT#11684

---
 main/inc/lib/api.lib.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/main/inc/lib/api.lib.php b/main/inc/lib/api.lib.php
index e29bcce355..8f56068738 100644
--- a/main/inc/lib/api.lib.php
+++ b/main/inc/lib/api.lib.php
@@ -7861,13 +7861,14 @@ function api_mail_html(
     $defaultEmail = $notification->getDefaultPlatformSenderEmail();
     $defaultName = $notification->getDefaultPlatformSenderName();
 
-    // Error to admin.
-    $mail->AddCustomHeader('Errors-To: '.$defaultEmail);
-
     // If the parameter is set don't use the admin.
     $senderName = !empty($senderName) ? $senderName : $defaultName;
     $senderEmail = !empty($senderEmail) ? $senderEmail : $defaultEmail;
 
+    // Errors to sender
+    $mail->AddCustomHeader('Errors-To: '.$senderEmail);
+    $mail->AddCustomHeader('envelope-from: '.$defaultEmail);
+
     // Reply to first
     if (isset($extra_headers['reply_to'])) {
         $mail->AddReplyTo(
@@ -7995,6 +7996,7 @@ function api_mail_html(
         }
     }
 
+
     // WordWrap the html body (phpMailer only fixes AltBody) FS#2988
     $mail->Body = $mail->WrapText($mail->Body, $mail->WordWrap);