Fix issue where From address was removed from Cc and Bcc fields when editin...

Aleksander Machniak

2013-09-08 4a40636cca6fbeaeb50b26e2d57e3fa31aeabce0

Fix issue where From address was removed from Cc and Bcc fields when editing a draft (#1489319)

 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)
- Add option to import Vcards with group assignments
- Save groups membership in Vcard export (#1488509)
- Workaround broken PHP function timezone_name_from_abbr (#1489261)

 program/steps/mail/compose.inc

@@ -377,7 +377,12 @@
      $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']);