diff --git a/backup_imap/backup_imap.py b/backup_imap/backup_imap.py
index 0f546ba..37b5dac 100644
--- a/backup_imap/backup_imap.py
+++ b/backup_imap/backup_imap.py
@@ -171,7 +171,6 @@ class BackupImap:
                                         "mailbox": mailbox
                                     }
                                 )
-                                self._save_cached_data(self.data)
                             except OSError as error:
                                 if error.errno == 36: # File name too long
                                     message_path = os.path.join(
@@ -186,7 +185,6 @@ class BackupImap:
                                             "mailbox": mailbox
                                         }
                                     )
-                                    self._save_cached_data(self.data)
                                 else:
                                     self._log.error(
                                         "Error writing email '%s'. %s",
@@ -197,6 +195,7 @@ class BackupImap:
                             self._log.debug(
                                 "Skipping already backed up message"
                             )
+                self._save_cached_data(self.data)
 
     def _backedup_message(self, message_id, mailbox):
         for message in self.data['backedup_messages']: