diff --git a/offlineimap/folder/Gmail.py b/offlineimap/folder/Gmail.py
index 5d11119..e3433c0 100644
--- a/offlineimap/folder/Gmail.py
+++ b/offlineimap/folder/Gmail.py
@@ -18,7 +18,7 @@
 
 """Folder implementation to support features of the Gmail IMAP server.
 """
-from IMAP import IMAPFolder
+from .IMAP import IMAPFolder
 
 class GmailFolder(IMAPFolder):
     """Folder implementation to support features of the Gmail IMAP server.
diff --git a/offlineimap/folder/IMAP.py b/offlineimap/folder/IMAP.py
index 9d53e89..4e7e885 100644
--- a/offlineimap/folder/IMAP.py
+++ b/offlineimap/folder/IMAP.py
@@ -21,7 +21,7 @@ import binascii
 import re
 import time
 from sys import exc_info
-from Base import BaseFolder
+from .Base import BaseFolder
 from offlineimap import imaputil, imaplibutil, OfflineImapError
 from offlineimap.imaplib2 import MonthNames
 
diff --git a/offlineimap/folder/LocalStatus.py b/offlineimap/folder/LocalStatus.py
index e637d94..7f27768 100644
--- a/offlineimap/folder/LocalStatus.py
+++ b/offlineimap/folder/LocalStatus.py
@@ -15,7 +15,7 @@
 #    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 BaseFolder
+from .Base import BaseFolder
 import os
 import threading
 
diff --git a/offlineimap/folder/LocalStatusSQLite.py b/offlineimap/folder/LocalStatusSQLite.py
index f59d4b2..dbe3e66 100644
--- a/offlineimap/folder/LocalStatusSQLite.py
+++ b/offlineimap/folder/LocalStatusSQLite.py
@@ -17,7 +17,7 @@
 import os.path
 import re
 from threading import Lock
-from LocalStatus import LocalStatusFolder
+from .LocalStatus import LocalStatusFolder
 try:
     import sqlite3 as sqlite
 except:
diff --git a/offlineimap/folder/Maildir.py b/offlineimap/folder/Maildir.py
index 11541e4..8ca32e5 100644
--- a/offlineimap/folder/Maildir.py
+++ b/offlineimap/folder/Maildir.py
@@ -19,7 +19,7 @@ import socket
 import time
 import re
 import os
-from Base import BaseFolder
+from .Base import BaseFolder
 from threading import Lock
 
 try:
diff --git a/offlineimap/folder/UIDMaps.py b/offlineimap/folder/UIDMaps.py
index ac0a9b4..36e92af 100644
--- a/offlineimap/folder/UIDMaps.py
+++ b/offlineimap/folder/UIDMaps.py
@@ -15,7 +15,7 @@
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 from threading import Lock
-from IMAP import IMAPFolder
+from .IMAP import IMAPFolder
 import os.path
 
 class MappedIMAPFolder(IMAPFolder):
diff --git a/offlineimap/folder/__init__.py b/offlineimap/folder/__init__.py
index 425148b..2b54a71 100644
--- a/offlineimap/folder/__init__.py
+++ b/offlineimap/folder/__init__.py
@@ -1,2 +1,2 @@
-import Base, Gmail, IMAP, Maildir, LocalStatus
+from . import Base, Gmail, IMAP, Maildir, LocalStatus