From a36e1ef9671e38f421586c386e94cb1eb4e9b83f Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 30 Dec 2010 11:19:43 +0000
Subject: - Fix handling of INBOX when personal namespace prefix is non-empty
 (#1487657)

---
 CHANGELOG                      | 1 +
 program/include/rcube_imap.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 7aaa34a6d..4d695da0e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@ CHANGELOG Roundcube Webmail
 - Show the same message only once (#1487641)
 - Fix namespaces handling (#1487649)
 - Add handling of multifolder METADATA/ANNOTATION responses
+- Fix handling of INBOX when personal namespace prefix is non-empty (#1487657)
 
 RELEASE 0.5-RC
 --------------
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index 5e4d22824..24c361c3f 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -3337,7 +3337,7 @@ class rcube_imap
                     }
                 }
                 // Add prefix if first personal namespace is non-empty
-                if ($this->namespace['personal'][0][0]) {
+                if ($mbox_name != 'INBOX' && $this->namespace['personal'][0][0]) {
                     return $this->namespace['personal'][0][0].$mbox_name;
                 }
             }
-- 
cgit v1.2.3