diff options
| author | Thomas Bruederli <thomas@roundcube.net> | 2013-07-25 22:38:14 +0200 |
|---|---|---|
| committer | Thomas Bruederli <thomas@roundcube.net> | 2013-07-25 22:38:14 +0200 |
| commit | c54157bb92f5e950cba9c391d29e441023cdddf4 (patch) | |
| tree | a182bc5cb399bf3f8dfb2a967e4a1e08f7dce9eb /program/steps/mail | |
| parent | 042b73f6cff2f0708617a1f3973b59529b8665b5 (diff) | |
Fix identity-selection using Return-Path headers (#1489241)
Diffstat (limited to 'program/steps/mail')
| -rw-r--r-- | program/steps/mail/func.inc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index ae23d4a6d..a41e3ffeb 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -1783,9 +1783,8 @@ function rcmail_identity_select($MESSAGE, $identities = null, $compose_mode = 'r // Try Return-Path if ($from_idx === null && ($return_path = $MESSAGE->headers->others['return-path'])) { foreach ($identities as $idx => $ident) { - $ident = str_replace('@', '=', $ident['email_ascii']) . '@'; foreach ((array)$return_path as $path) { - if (strpos($path, $ident) !== false) { + if (stripos($path, $ident['email_ascii']) !== false) { $from_idx = $idx; break 2; } |