diff --git a/VERSION b/VERSION
index 86fd44e8..95110752 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.00.0 (2012-06-05 18:00:56) dev
+Version 2.00.0 (2012-06-05 18:07:58) dev
diff --git a/gluon/dal.py b/gluon/dal.py
index e314156c..469a0144 100644
--- a/gluon/dal.py
+++ b/gluon/dal.py
@@ -5330,7 +5330,7 @@ class IMAPAdapter(NoSQLAdapter):
                 sub_items = [sub_item for sub_item in sub_items if len(sub_item.strip()) > 0]
                 mailbox = sub_items[len(sub_items) - 1]
                 # remove unwanted characters and store original names
-                mailbox_name = mailbox.replace("[", "").replace("]", "").replace("/", "_")
+                mailbox_name = re.sub('[^_\w]','',re.sub('[/ ]','_',mailbox))
                 mailboxes.append(mailbox_name)
                 self.connection.mailbox_names[mailbox_name] = mailbox
         # print "Mailboxes query", mailboxes