From 20ef295ba8ff0e9fce57ee24dd7f467a366a5c88 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 28 May 2014 09:05:52 +0200
Subject: Fix UTF7-IMAP encoding detection (fixes folders list sorting)

---
 program/lib/Roundcube/rcube_imap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'program/lib/Roundcube/rcube_imap.php')

diff --git a/program/lib/Roundcube/rcube_imap.php b/program/lib/Roundcube/rcube_imap.php
index e4b77a0a3..8bdc92bee 100644
--- a/program/lib/Roundcube/rcube_imap.php
+++ b/program/lib/Roundcube/rcube_imap.php
@@ -4151,7 +4151,7 @@ class rcube_imap extends rcube_storage
             if ($folder[0] != '.') {
                 // for better performance skip encoding conversion
                 // if the string does not look like UTF7-IMAP
-                $folders[$folder] = strpos($folder, '+') === false ? $folder : rcube_charset::convert($folder, 'UTF7-IMAP');
+                $folders[$folder] = strpos($folder, '&') === false ? $folder : rcube_charset::convert($folder, 'UTF7-IMAP');
             }
             else {
                 unset($folders[$idx]);
-- 
cgit v1.2.3