From 6632d42717f124a938db62a69bca601f4c336257 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Sun, 8 Sep 2013 18:06:58 +0200 Subject: Fix issue where From address was removed from Cc and Bcc fields when editing a draft (#1489319) Conflicts: CHANGELOG --- CHANGELOG | 1 + program/steps/mail/compose.inc | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index cafdcc51b..4dbc6f625 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Fix issue where From address was removed from Cc and Bcc fields when editing a draft (#1489319) - Fix error_reporting directive check (#1489323) RELEASE 0.9.4 diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index d4d08d17b..19d45cbf5 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -368,7 +368,12 @@ foreach ($parts as $header) { $mailto = format_email(rcube_idn_to_utf8($addr_part['mailto'])); if (!in_array($mailto, $a_recipients) - && ($header == 'to' || empty($MESSAGE->compose['from_email']) || $mailto != $MESSAGE->compose['from_email']) + && ( + $header == 'to' + || $compose_mode != RCUBE_COMPOSE_REPLY + || empty($MESSAGE->compose['from_email']) + || $mailto != $MESSAGE->compose['from_email'] + ) ) { if ($addr_part['name'] && $addr_part['mailto'] != $addr_part['name']) $string = format_email_recipient($mailto, $addr_part['name']); -- cgit v1.2.3