diff --git a/pykolab/imap/__init__.py b/pykolab/imap/__init__.py
index 21d918b..d6b8fc9 100644
--- a/pykolab/imap/__init__.py
+++ b/pykolab/imap/__init__.py
@@ -522,6 +522,9 @@ class IMAP(object):
         if not hasattr(self, 'domain'):
             self.domain == None
 
+        if self.domain == None and len(mailbox_base_name.split('@')) > 1:
+            self.domain = mailbox_base_name.split('@')[1]
+
         if not self.domain == None:
             if conf.has_option(self.domain, "autocreate_folders"):
                 _additional_folders = conf.get_raw(