diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 1102bbd32d..33e0abb24d 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -395,6 +395,9 @@ class Core {
                                     db.message().setMessageError(m.id, Helper.formatThrowable(ex));
                             }
 
+                            if (similar.size() > 0 && !(ex instanceof IllegalArgumentException))
+                                db.folder().setFolderError(folder.id, Helper.formatThrowable(ex));
+
                             db.setTransactionSuccessful();
                         } finally {
                             db.endTransaction();