Merge e12f008d39 into c1df95b7d3

offlineimap/accounts.py

@@ -528,6 +528,9 @@ def syncfolder(account, remotefolder, quick):
         # Load local folder.
         localfolder = account.get_local_folder(remotefolder)
 
+        localfolder.mutex.acquire()
+        remotefolder.mutex.acquire()
+
         # Add the folder to the mbnames mailboxes.
         mbnames.add(account.name, localrepos.getlocalroot(),
             localfolder.getname())
@@ -616,3 +619,5 @@ def syncfolder(account, remotefolder, quick):
             if folder in locals():
                 locals()[folder].dropmessagelistcache()
         statusfolder.closefiles()
+        remotefolder.mutex.release()
+        localfolder.mutex.release()

offlineimap/folder/Base.py

@@ -19,6 +19,7 @@ import os.path
 import re
 import time
 from sys import exc_info
+from threading import Lock
 
 from offlineimap import threadutil
 from offlineimap.ui import getglobalui
@@ -91,6 +92,8 @@ class BaseFolder(object):
             self.__syncmessagesto_flags,
         ]
 
+        self.mutex = Lock()
+
     def getname(self):
         """Returns name"""
         return self.name