diff --git a/offlineimap/ui/Machine.py b/offlineimap/ui/Machine.py
index e5988e5..e8864ab 100644
--- a/offlineimap/ui/Machine.py
+++ b/offlineimap/ui/Machine.py
@@ -15,9 +15,11 @@
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-import urllib, sys, re, time, traceback, threading, thread
+import urllib
+import sys
+import time
 from UIBase import UIBase
-from threading import *
+from threading import currentThread, Lock
 import offlineimap
 
 protocol = '6.0.0'
diff --git a/offlineimap/ui/UIBase.py b/offlineimap/ui/UIBase.py
index 6621a62..03b76e0 100644
--- a/offlineimap/ui/UIBase.py
+++ b/offlineimap/ui/UIBase.py
@@ -16,7 +16,11 @@
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-import re, time, sys, traceback, threading, thread
+import re
+import time
+import sys
+import traceback
+import threading
 from StringIO import StringIO
 from Queue import Empty
 import offlineimap