diff --git a/app/src/main/java/eu/faircode/email/EntityRule.java b/app/src/main/java/eu/faircode/email/EntityRule.java
index 42b031184b..aad717dd4c 100644
--- a/app/src/main/java/eu/faircode/email/EntityRule.java
+++ b/app/src/main/java/eu/faircode/email/EntityRule.java
@@ -523,7 +523,10 @@ public class EntityRule {
 
                 if (cal_start.getTimeInMillis() > cal_end.getTimeInMillis())
                     if (all)
-                        cal_start.add(Calendar.DATE, -1);
+                        if (cal_end.getTimeInMillis() < message.received)
+                            cal_end.add(Calendar.DATE, 1);
+                        else
+                            cal_start.add(Calendar.DATE, -1);
                     else
                         cal_start.add(Calendar.HOUR_OF_DAY, -7 * 24);