From ad2ba95dcd196bf21c159c57f9198a0674f5125d Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Mon, 3 Jun 2013 09:57:35 +0200 Subject: [PATCH] Fix so bounces addresses in Sender headers are skipped on Reply-All (#1489011) --- CHANGELOG | 1 + program/steps/mail/compose.inc | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 74d7d84cc..45d9dab53 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) - Improved handling of Reply-To/Bcc addresses of identity in compose form (#1489016) - Fix displaying messages with invalid self-closing HTML tags (#1489137) 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)