summaryrefslogtreecommitdiff
path: root/program/steps
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-09-08 18:06:58 +0200
committerAleksander Machniak <alec@alec.pl>2013-09-08 18:06:58 +0200
commit4a40636cca6fbeaeb50b26e2d57e3fa31aeabce0 (patch)
tree5719a61289ee95c1d882f1f0dd63764c18f63716 /program/steps
parent217d47e39fa00f089030ba11fa65013c9caf218b (diff)
Fix issue where From address was removed from Cc and Bcc fields when editing a draft (#1489319)
Diffstat (limited to 'program/steps')
-rw-r--r--program/steps/mail/compose.inc7
1 files changed, 6 insertions, 1 deletions
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index f3ff19d72..4a0e52b2b 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -377,7 +377,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']);