5 files changed, 14 insertions, 16 deletions
diff --git a/src/leap/bitmask/mail/imap/account.py b/src/leap/bitmask/mail/imap/account.py
index e795c1b9..d885d591 100644
--- a/src/leap/bitmask/mail/imap/account.py
+++ b/src/leap/bitmask/mail/imap/account.py
@@ -28,10 +28,9 @@ from twisted.python import log
 from zope.interface import implements
 
 from leap.common.check import leap_assert, leap_assert_type
-
-from leap.mail.constants import MessageFlags
-from leap.mail.mail import Account
-from leap.mail.imap.mailbox import IMAPMailbox, normalize_mailbox
+from leap.bitmask.mail.constants import MessageFlags
+from leap.bitmask.mail.mail import Account
+from leap.bitmask.mail.imap.mailbox import IMAPMailbox, normalize_mailbox
 from leap.soledad.client import Soledad
 
 logger = logging.getLogger(__name__)
diff --git a/src/leap/bitmask/mail/imap/mailbox.py b/src/leap/bitmask/mail/imap/mailbox.py
index e70a1d80..b80280c6 100644
--- a/src/leap/bitmask/mail/imap/mailbox.py
+++ b/src/leap/bitmask/mail/imap/mailbox.py
@@ -36,8 +36,8 @@ from zope.interface import implements
 
 from leap.common.check import leap_assert
 from leap.common.check import leap_assert_type
-from leap.mail.constants import INBOX_NAME, MessageFlags
-from leap.mail.imap.messages import IMAPMessage
+from leap.bitmask.mail.constants import INBOX_NAME, MessageFlags
+from leap.bitmask.mail.imap.messages import IMAPMessage
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/leap/bitmask/mail/imap/messages.py b/src/leap/bitmask/mail/imap/messages.py
index d1c7b93c..841ebb2f 100644
--- a/src/leap/bitmask/mail/imap/messages.py
+++ b/src/leap/bitmask/mail/imap/messages.py
@@ -22,7 +22,7 @@ from twisted.mail import imap4
 from twisted.internet import defer
 from zope.interface import implements
 
-from leap.mail.utils import find_charset, CaseInsensitiveDict
+from leap.bitmask.mail.utils import find_charset, CaseInsensitiveDict
 
 
 logger = logging.getLogger(__name__)
diff --git a/src/leap/bitmask/mail/imap/service/imap-server.tac b/src/leap/bitmask/mail/imap/service/imap-server.tac
index c4d602db..685db6bc 100644
--- a/src/leap/bitmask/mail/imap/service/imap-server.tac
+++ b/src/leap/bitmask/mail/imap/service/imap-server.tac
@@ -28,19 +28,18 @@ userid = 'user@provider'
 uuid = 'deadbeefdeadabad'
 passwd = 'supersecret' # optional, will get prompted if not found.
 """
-
 # TODO -- this .tac file should be deprecated in favor of bitmask.core.bitmaskd
-
 import ConfigParser
 import getpass
 import os
 import sys
 
-from leap.keymanager import KeyManager
-from leap.mail.imap.service import imap
+from twisted.application import service, internet
+
+from leap.bitmask.keymanager import KeyManager
+from leap.bitmask.mail.imap.service import imap
 from leap.soledad.client import Soledad
 
-from twisted.application import service, internet
 
 
 # TODO should get this initializers from some authoritative mocked source
diff --git a/src/leap/bitmask/mail/imap/service/imap.py b/src/leap/bitmask/mail/imap/service/imap.py
index 4663854a..aac49b63 100644
--- a/src/leap/bitmask/mail/imap/service/imap.py
+++ b/src/leap/bitmask/mail/imap/service/imap.py
@@ -32,9 +32,9 @@ from twisted.python import log
 from zope.interface import implementer
 
 from leap.common.events import emit_async, catalog
-from leap.mail.cred import LocalSoledadTokenChecker
-from leap.mail.imap.account import IMAPAccount
-from leap.mail.imap.server import LEAPIMAPServer
+from leap.bitmask.mail.cred import LocalSoledadTokenChecker
+from leap.bitmask.mail.imap.account import IMAPAccount
+from leap.bitmask.mail.imap.server import LEAPIMAPServer
 
 # TODO: leave only an implementor of IService in here
 
@@ -42,7 +42,7 @@ logger = logging.getLogger(__name__)
 
 DO_MANHOLE = os.environ.get("LEAP_MAIL_MANHOLE", None)
 if DO_MANHOLE:
-    from leap.mail.imap.service import manhole
+    from leap.bitmask.mail.imap.service import manhole
 
 # The default port in which imap service will run