summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2010-10-12 18:21:57 +0000
committeralecpl <alec@alec.pl>2010-10-12 18:21:57 +0000
commit663534468c5f4bc974386f0df491b46de1ae5437 (patch)
tree525fc51e626b4b834373a8120c7a9fc878466db4
parentace851722e8ada8810dfc65bdc3c1499b2145354 (diff)
- Fix setting identity when composing a draft or edited message
-rw-r--r--program/steps/mail/compose.inc5
1 files changed, 3 insertions, 2 deletions
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 88fa425c2..80cc7d190 100644
--- a/program/steps/mail/compose.inc
+++ b/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']))