summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2011-08-19 10:11:03 +0000
committeralecpl <alec@alec.pl>2011-08-19 10:11:03 +0000
commit8015bb94319e1d0434275599fdcbc7d0d28c5ea8 (patch)
treece3af3c6d7ab1505da262dc2302d105d971c3e12
parent4436b434800e5b4094be22a053dfce6c14a68fa7 (diff)
- Followup to r5097, fix: match From with full address spec.
-rw-r--r--program/steps/mail/compose.inc7
1 files changed, 4 insertions, 3 deletions
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 3a3847a58..4449ea0b2 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -274,16 +274,17 @@ else if (count($MESSAGE->identities)) {
// use From header
if (in_array($compose_mode, array(RCUBE_COMPOSE_DRAFT, RCUBE_COMPOSE_EDIT))) {
- if ($MESSAGE->headers->from == $ident['email_ascii']) {
+ if ($MESSAGE->headers->from == $ident['ident']) {
$from_idx = $idx;
break;
}
}
- else if ($compose_mode == RCUBE_COMPOSE_REPLY && $MESSAGE->headers->from == $ident['email_ascii']) {
+ // reply to yourself
+ else if ($compose_mode == RCUBE_COMPOSE_REPLY && $MESSAGE->headers->from == $ident['ident']) {
$from_idx = $idx;
break;
}
- // use reply-message recipients
+ // use replied message recipients
else if (in_array($ident['email_ascii'], $a_recipients)) {
$from_idx = $idx;
}