From 93adce7abfcfc3c8cec06566f0b5cb85d4f0dc49 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 6 Sep 2013 09:12:30 +0200
Subject: Make identities matching case insensitive (#1485480)

---
 CHANGELOG                   | 1 +
 program/steps/mail/func.inc | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 72115ad5a..e5a772f92 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Make identities matching case insensitive (#1485480)
 - Fix issue where too big message data was stored in cache causing sql errors (#1489316)
 
 RELEASE 0.9.4
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 28e6baadf..8de76c3c9 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -1748,7 +1748,7 @@ function rcmail_identity_select($MESSAGE, $identities = null, $compose_mode = 'r
         $a_to = rcube_mime::decode_address_list($MESSAGE->headers->to, null, true, $MESSAGE->headers->charset);
         foreach ($a_to as $addr) {
             if (!empty($addr['mailto'])) {
-                $a_recipients[] = format_email($addr['mailto']);
+                $a_recipients[] = strtolower($addr['mailto']);
                 $a_names[]      = $addr['name'];
             }
         }
@@ -1757,7 +1757,7 @@ function rcmail_identity_select($MESSAGE, $identities = null, $compose_mode = 'r
             $a_cc = rcube_mime::decode_address_list($MESSAGE->headers->cc, null, true, $MESSAGE->headers->charset);
             foreach ($a_cc as $addr) {
                 if (!empty($addr['mailto'])) {
-                    $a_recipients[] = format_email($addr['mailto']);
+                    $a_recipients[] = strtolower($addr['mailto']);
                     $a_names[]      = $addr['name'];
                 }
             }
@@ -1783,7 +1783,7 @@ function rcmail_identity_select($MESSAGE, $identities = null, $compose_mode = 'r
             break;
         }
         // use replied message recipients
-        else if (($found = array_search($ident['email_ascii'], $a_recipients)) !== false) {
+        else if (($found = array_search(strtolower($ident['email_ascii']), $a_recipients)) !== false) {
             if ($found_idx === null) {
                 $found_idx = $idx;
             }
-- 
cgit v1.2.3