summaryrefslogtreecommitdiff
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:59:14 +0200
commit0a7df4a32e86a103a5f1fe801374383a195ba1a5 (patch)
tree56d2fa176309356585a5bad6f21057bc137bcb69
parentab05ee25c1d38c884790337796f7c941e28d36d9 (diff)
Fix so bounces addresses in Sender headers are skipped on Reply-All (#1489011)
-rw-r--r--CHANGELOG1
-rw-r--r--program/steps/mail/compose.inc3
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index dc74f81ce..991eebce3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Fix so bounces addresses in Sender headers are skipped on Reply-All (#1489011)
- Fix bug where serialized strings were truncated in PDO::quote() (#1489142)
- Fix displaying messages with invalid self-closing HTML tags (#1489137)
- Fix PHP warning when responding to a message with many Return-Path headers (#1489136)
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 3787da372..47dfa52ce 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -318,7 +318,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)