From ccce3cce3aa6d638f74fe330dfbd29f10ff35334 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Thu, 25 Jul 2013 22:38:14 +0200
Subject: Fix identity-selection using Return-Path headers (#1489241)

---
 program/steps/mail/func.inc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 2a1796c78..16a9f495d 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -1803,9 +1803,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;
                 }
-- 
cgit v1.2.3