2 files changed, 4 insertions, 4 deletions
diff --git a/src/leap/mail/imap/service/imap-server.tac b/src/leap/mail/imap/service/imap-server.tac
index 8638be2..da72cae 100644
--- a/src/leap/mail/imap/service/imap-server.tac
+++ b/src/leap/mail/imap/service/imap-server.tac
@@ -1,10 +1,9 @@
 import ConfigParser
 import os
 
-from xdg import BaseDirectory
-
 from leap.soledad.client import Soledad
 from leap.mail.imap.service import imap
+from leap.common.config import get_path_prefix
 
 
 config = ConfigParser.ConfigParser()
@@ -34,7 +33,7 @@ def initialize_soledad_mailbox(user_uuid, soledad_pass, server_url,
     :rtype: Soledad instance
     """
 
-    base_config = BaseDirectory.xdg_config_home
+    base_config = get_path_prefix()
 
     secret_path = os.path.join(
         base_config, "leap", "soledad", "%s.secret" % user_uuid)
diff --git a/src/leap/mail/imap/service/imap.py b/src/leap/mail/imap/service/imap.py
index 9e9a524..b840e86 100644
--- a/src/leap/mail/imap/service/imap.py
+++ b/src/leap/mail/imap/service/imap.py
@@ -157,7 +157,8 @@ def run_service(*args, **kwargs):
     from twisted.internet import reactor
 
     try:
-        reactor.listenTCP(port, factory)
+        reactor.listenTCP(port, factory,
+                          interface="localhost")
         fetcher = LeapIncomingMail(
             keymanager,
             soledad,