summaryrefslogtreecommitdiff
path: root/program
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:08:03 +0200
commit6632d42717f124a938db62a69bca601f4c336257 (patch)
tree748c9f072d083e2b41648ace8f556cb9d63c6572 /program
parentd499f06613591b401fe842ff4b84b0e3305eaca8 (diff)
Fix issue where From address was removed from Cc and Bcc fields when editing a draft (#1489319)
Conflicts: CHANGELOG
Diffstat (limited to 'program')
-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 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']);