diff --git a/mech_imap.py b/mech_imap.py
index fb245de..c588915 100644
--- a/mech_imap.py
+++ b/mech_imap.py
@@ -9,7 +9,7 @@ from twisted.internet import protocol, ssl
 from twisted.mail import imap4
 
 from serpent.config import conf
-from serpent.imap.mailbox import IMAPMailbox
+from serpent.imap.mbox import IMAPMailbox
 from serpent.misc import IMAP_HDELIM, IMAP_MBOX_REG, IMAP_ACC_CONN_NUM
 from shutil import rmtree, move
 
diff --git a/serpent/dataio.py b/serpent/dataio.py
index 64e50a4..c81c590 100644
--- a/serpent/dataio.py
+++ b/serpent/dataio.py
@@ -60,9 +60,9 @@ class SmtpFileStore(object):
 
 class MailDirStore(object):
     def __init__(self):
-        from serpent.imap import mailbox
+        from serpent.imap import mbox
         from mailbox import MaildirMessage
-        self.mbox = mailbox
+        self.mbox = mbox
         self.mbox.MaildirMessage = MaildirMessage
     def deliver(self, user, message):
         mdir = os.path.join(conf.app_dir, conf.maildir_user_path % user)
diff --git a/serpent/imap/mailbox.py b/serpent/imap/mbox.py
similarity index 95%
rename from serpent/imap/mailbox.py
rename to serpent/imap/mbox.py
index 8c9a542..be87ad3 100644
--- a/serpent/imap/mailbox.py
+++ b/serpent/imap/mbox.py
@@ -1,4 +1,4 @@
-from mailbox import Maildir, MaildirMessage
+from mailbox import Maildir
 import os
 
 class ExtendedMaildir(Maildir):