From ad2ba95dcd196bf21c159c57f9198a0674f5125d Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 3 Jun 2013 09:57:35 +0200
Subject: Fix so bounces addresses in Sender headers are skipped on Reply-All
 (#1489011)

---
 program/steps/mail/compose.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'program/steps/mail')

diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 140554514..ebdd7a075 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -327,7 +327,8 @@ foreach ($parts as $header) {
         $fvalue .= $v;
       if ($v = $MESSAGE->headers->cc)
         $fvalue .= (!empty($fvalue) ? $separator : '') . $v;
-      if ($v = $MESSAGE->headers->get('Sender', false))
+      // Use Sender header (#1489011)
+      if (($v = $MESSAGE->headers->get('Sender', false)) && strpos($v, '-bounces@') === false)
         $fvalue .= (!empty($fvalue) ? $separator : '') . $v;
 
       // When To: and Reply-To: are the same we add From: address to the list (#1489037)
-- 
cgit v1.2.3