diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 59a80d4ac2..3b0205554e 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -1789,8 +1789,6 @@ class Core {
 
     private static void onPurgeFolder(Context context, JSONArray jargs, EntityFolder folder, IMAPFolder ifolder) throws MessagingException {
         // Delete all messages from folder
-        DB db = DB.getInstance(context);
-
         try {
             final MessageSet[] sets = new MessageSet[]{new MessageSet(1, ifolder.getMessageCount())};
 
@@ -1810,15 +1808,12 @@ class Core {
             Log.e(ex);
             throw ex;
         } finally {
-            int count = MessageHelper.getMessageCount(ifolder);
-            db.folder().setFolderTotal(folder.id, count < 0 ? null : count);
-
-            // Delete local, hidden messages
-            onPurgeFolder(context, folder);
+            EntityOperation.sync(context, folder.id, false);
         }
     }
 
     private static void onPurgeFolder(Context context, EntityFolder folder) {
+        // POP3
         DB db = DB.getInstance(context);
         try {
             db.beginTransaction();
diff --git a/app/src/main/java/eu/faircode/email/DaoOperation.java b/app/src/main/java/eu/faircode/email/DaoOperation.java
index bdb8979c81..25daae9a6c 100644
--- a/app/src/main/java/eu/faircode/email/DaoOperation.java
+++ b/app/src/main/java/eu/faircode/email/DaoOperation.java
@@ -34,6 +34,7 @@ public interface DaoOperation {
             " WHEN operation.name = '" + EntityOperation.ATTACHMENT + "' THEN -3" +
             " WHEN operation.name = '" + EntityOperation.HEADERS + "' THEN -2" +
             " WHEN operation.name = '" + EntityOperation.RAW + "' THEN -2" +
+            " WHEN operation.name = '" + EntityOperation.PURGE + "' THEN -2" +
             " WHEN operation.name = '" + EntityOperation.SYNC + "' AND folder.account IS NULL THEN -1" + // Outbox
             " WHEN operation.name = '" + EntityOperation.SYNC + "' AND folder.account IS NOT NULL THEN 1" +
             // Other operations: add, delete, seen, answered, flag, keyword, label, subscribe, send
diff --git a/app/src/main/java/eu/faircode/email/FragmentFolders.java b/app/src/main/java/eu/faircode/email/FragmentFolders.java
index 7b9fbf7d54..8babcf28ff 100644
--- a/app/src/main/java/eu/faircode/email/FragmentFolders.java
+++ b/app/src/main/java/eu/faircode/email/FragmentFolders.java
@@ -736,7 +736,6 @@ public class FragmentFolders extends FragmentBase {
                     }
 
                     EntityOperation.queue(context, folder, EntityOperation.PURGE);
-                    EntityOperation.sync(context, folder.id, false);
 
                     db.setTransactionSuccessful();
                 } finally {
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 05bb4d635d..427f78e231 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -7278,7 +7278,6 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                         }
 
                         EntityOperation.queue(context, folder, EntityOperation.PURGE);
-                        EntityOperation.sync(context, folder.id, false);
                     }
 
                     db.setTransactionSuccessful();