summaryrefslogtreecommitdiff
path: root/program/steps
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-06-03 09:57:35 +0200
committerAleksander Machniak <alec@alec.pl>2013-06-03 09:57:35 +0200
commitad2ba95dcd196bf21c159c57f9198a0674f5125d (patch)
tree7faa0779c00d2b1ca6bd85a9b165263fff0cf687 /program/steps
parent5df4fe56d509a5c9702506a79f32dcd81d7adc41 (diff)
Fix so bounces addresses in Sender headers are skipped on Reply-All (#1489011)
Diffstat (limited to 'program/steps')
-rw-r--r--program/steps/mail/compose.inc3
1 files changed, 2 insertions, 1 deletions
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)