diff --git a/app/src/main/java/eu/faircode/email/EntityFolder.java b/app/src/main/java/eu/faircode/email/EntityFolder.java
index cab99a73d9..c9623d9fa8 100644
--- a/app/src/main/java/eu/faircode/email/EntityFolder.java
+++ b/app/src/main/java/eu/faircode/email/EntityFolder.java
@@ -193,7 +193,7 @@ public class EntityFolder extends EntityOrder implements Serializable {
         }
 
         JSONArray jargs = new JSONArray();
-        jargs.put(initialize == 0 ? days : Math.min(keep_days, initialize));
+        jargs.put(initialize == 0 ? Math.min(days, keep_days) : Math.min(keep_days, initialize));
         jargs.put(keep_days);
         jargs.put(download);
         jargs.put(auto_delete);