diff --git a/offlineimap/threadutil.py b/offlineimap/threadutil.py
index 7499ec4..92c54e2 100644
--- a/offlineimap/threadutil.py
+++ b/offlineimap/threadutil.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2011 John Goerzen & contributors
+# Copyright (C) 2002-2012 John Goerzen & contributors
 # Thread support module
 #
 #    This program is free software; you can redistribute it and/or modify
@@ -16,7 +16,10 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 from threading import Lock, Thread, BoundedSemaphore
-from Queue import Queue, Empty
+try:
+    from Queue import Queue, Empty
+except ImportError: # python3
+    from queue import Queue, Empty
 import traceback
 from thread import get_ident	# python < 2.6 support
 import os.path
diff --git a/offlineimap/ui/UIBase.py b/offlineimap/ui/UIBase.py
index 74ef22e..bf46e6f 100644
--- a/offlineimap/ui/UIBase.py
+++ b/offlineimap/ui/UIBase.py
@@ -22,7 +22,10 @@ import sys
 import os
 import traceback
 import threading
-from Queue import Queue
+try:
+    from Queue import Queue
+except ImportError: #python3
+    from queue import Queue
 from collections import deque
 from offlineimap.error import OfflineImapError
 import offlineimap