diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-10-12 18:21:57 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-10-12 18:21:57 +0000 |
| commit | ae428f3ffbf3df5a1b47f7767e53dc7f5c61d9f8 (patch) | |
| tree | 06902d9a1ec6803f2eb254cdf0c6e26c0474f5b8 /roundcubemail/program | |
| parent | ddecb0fe0d061aabfb1366be88d32ca1e49e809d (diff) | |
- Fix setting identity when composing a draft or edited message
git-svn-id: https://svn.roundcube.net/trunk@4080 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program')
| -rw-r--r-- | roundcubemail/program/steps/mail/compose.inc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/roundcubemail/program/steps/mail/compose.inc b/roundcubemail/program/steps/mail/compose.inc index 88fa425c2..80cc7d190 100644 --- a/roundcubemail/program/steps/mail/compose.inc +++ b/roundcubemail/program/steps/mail/compose.inc @@ -466,10 +466,11 @@ function rcmail_compose_header_from($attrib) // Set identity foreach ($user_identities as $sql_arr) { // set draft's identity - if ($compose_mode == RCUBE_COMPOSE_DRAFT) { - if (strstr($MESSAGE->headers->from, $sql_arr['email'])) + if ($compose_mode == RCUBE_COMPOSE_DRAFT || $compose_mode == RCUBE_COMPOSE_EDIT) { + if ($MESSAGE->headers->from == format_email_recipient($sql_arr['email'], $sql_arr['name'])) { $from_id = $sql_arr['identity_id']; break; + } } // set identity if it's one of the reply-message recipients (with prio for default identity) else if (in_array($sql_arr['email'], $a_recipients) && (empty($from_id) || $sql_arr['standard'])) |