diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
index 7eb7a8b7ba..a2a3c0fca3 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -679,9 +679,9 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                 and.add(new FlagTerm(new Flags(Flags.Flag.FLAGGED), true));
 
             if (after != null)
-                and.add(new ReceivedDateTerm(ComparisonTerm.GT, new Date(after)));
+                and.add(new ReceivedDateTerm(ComparisonTerm.GE, new Date(after)));
             if (before != null)
-                and.add(new ReceivedDateTerm(ComparisonTerm.LT, new Date(before)));
+                and.add(new ReceivedDateTerm(ComparisonTerm.LE, new Date(before)));
 
             SearchTerm term = null;
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogSearch.java b/app/src/main/java/eu/faircode/email/FragmentDialogSearch.java
index d2e171f184..09fccc464e 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogSearch.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogSearch.java
@@ -352,6 +352,5 @@ public class FragmentDialogSearch extends FragmentDialogBase {
         });
 
         picker.show();
-
     }
 }