diff --git a/offlineimap/accounts.py b/offlineimap/accounts.py
index 2c44208..42cc22c 100644
--- a/offlineimap/accounts.py
+++ b/offlineimap/accounts.py
@@ -413,8 +413,9 @@ def syncfolder(account, remotefolder, quick):
                 localrepos.restore_atime()
                 return
         else:
-            localfolder.saveuidvalidity()
-            remotefolder.saveuidvalidity()
+            # Both folders empty, just save new UIDVALIDITY
+            localfolder.save_uidvalidity()
+            remotefolder.save_uidvalidity()
 
         # Load remote folder.
         ui.loadmessagelist(remoterepos, remotefolder)
diff --git a/offlineimap/folder/Base.py b/offlineimap/folder/Base.py
index ae654c8..e852018 100644
--- a/offlineimap/folder/Base.py
+++ b/offlineimap/folder/Base.py
@@ -122,7 +122,7 @@ class BaseFolder(object):
         if self.get_saveduidvalidity() != None:
             return self.get_saveduidvalidity() == self.get_uidvalidity()
         else:
-            self.saveuidvalidity()
+            self.save_uidvalidity()
             return True
 
     def _getuidfilename(self):
@@ -145,8 +145,8 @@ class BaseFolder(object):
             file.close()
         return self._base_saved_uidvalidity
 
-    def saveuidvalidity(self):
-        """Save the UID value of the folder to the status
+    def save_uidvalidity(self):
+        """Save the UIDVALIDITY value of the folder to the cache
 
         This function is not threadsafe, so don't attempt to call it
         from concurrent threads."""