diff --git a/offlineimap/repository/LocalStatus.py b/offlineimap/repository/LocalStatus.py
index b1e9fd0..30c8560 100644
--- a/offlineimap/repository/LocalStatus.py
+++ b/offlineimap/repository/LocalStatus.py
@@ -16,9 +16,9 @@
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-from Base import BaseRepository
 from offlineimap.folder.LocalStatus import LocalStatusFolder, magicline
 from offlineimap.folder.LocalStatusSQLite import LocalStatusSQLiteFolder
+from offlineimap.repository.Base import BaseRepository
 import os
 import re
 
diff --git a/offlineimap/repository/Maildir.py b/offlineimap/repository/Maildir.py
index 67f659b..7c08d64 100644
--- a/offlineimap/repository/Maildir.py
+++ b/offlineimap/repository/Maildir.py
@@ -16,10 +16,10 @@
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-from Base import BaseRepository
 from offlineimap import folder
 from offlineimap.ui import getglobalui
 from offlineimap.error import OfflineImapError
+from offlineimap.repository.Base import BaseRepository
 import os
 from stat import *
 
diff --git a/offlineimap/ui/Machine.py b/offlineimap/ui/Machine.py
index a87395d..8bf77da 100644
--- a/offlineimap/ui/Machine.py
+++ b/offlineimap/ui/Machine.py
@@ -17,8 +17,8 @@ from urllib import urlencode
 import sys
 import time
 import logging
-from UIBase import UIBase
 from threading import currentThread
+from offlineimap.ui.UIBase import UIBase
 import offlineimap
 
 protocol = '7.0.0'
diff --git a/offlineimap/ui/Noninteractive.py b/offlineimap/ui/Noninteractive.py
index 36bb92b..de1e8df 100644
--- a/offlineimap/ui/Noninteractive.py
+++ b/offlineimap/ui/Noninteractive.py
@@ -1,5 +1,5 @@
 # Noninteractive UI
-# Copyright (C) 2002-2011 John Goerzen & contributors
+# Copyright (C) 2002-2012 John Goerzen & contributors
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 import logging
-from UIBase import UIBase
+from offlineimap.ui.UIBase import UIBase
 
 class Basic(UIBase):
     """'Quiet' simply sets log level to INFO"""