diff --git a/app/src/main/java/eu/faircode/email/FragmentFolder.java b/app/src/main/java/eu/faircode/email/FragmentFolder.java
index f1a5115c14..aa49acb268 100644
--- a/app/src/main/java/eu/faircode/email/FragmentFolder.java
+++ b/app/src/main/java/eu/faircode/email/FragmentFolder.java
@@ -202,7 +202,7 @@ public class FragmentFolder extends FragmentEx {
 
                                 Calendar cal_keep = Calendar.getInstance();
                                 cal_keep.add(Calendar.DAY_OF_MONTH, -keep_days);
-                                cal_keep.set(Calendar.HOUR_OF_DAY, 0);
+                                cal_keep.set(Calendar.HOUR_OF_DAY, 12);
                                 cal_keep.set(Calendar.MINUTE, 0);
                                 cal_keep.set(Calendar.SECOND, 0);
                                 cal_keep.set(Calendar.MILLISECOND, 0);
diff --git a/app/src/main/java/eu/faircode/email/JobDaily.java b/app/src/main/java/eu/faircode/email/JobDaily.java
index 93357587ca..d316241f9c 100644
--- a/app/src/main/java/eu/faircode/email/JobDaily.java
+++ b/app/src/main/java/eu/faircode/email/JobDaily.java
@@ -79,7 +79,7 @@ public class JobDaily extends JobService {
             for (EntityFolder folder : db.folder().getFolders()) {
                 Calendar cal_keep = Calendar.getInstance();
                 cal_keep.add(Calendar.DAY_OF_MONTH, -folder.keep_days);
-                cal_keep.set(Calendar.HOUR_OF_DAY, 0);
+                cal_keep.set(Calendar.HOUR_OF_DAY, 12);
                 cal_keep.set(Calendar.MINUTE, 0);
                 cal_keep.set(Calendar.SECOND, 0);
                 cal_keep.set(Calendar.MILLISECOND, 0);
diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index 8e32aca04e..9fa070c4df 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -1872,7 +1872,7 @@ public class ServiceSynchronize extends LifecycleService {
 
             Calendar cal_keep = Calendar.getInstance();
             cal_keep.add(Calendar.DAY_OF_MONTH, -folder.keep_days);
-            cal_keep.set(Calendar.HOUR_OF_DAY, 0);
+            cal_keep.set(Calendar.HOUR_OF_DAY, 12);
             cal_keep.set(Calendar.MINUTE, 0);
             cal_keep.set(Calendar.SECOND, 0);
             cal_keep.set(Calendar.MILLISECOND, 0);