diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
index 78b73847e7..d6631e5d56 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -358,7 +358,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                         criteria.with_size,
                         criteria.after,
                         criteria.before,
-                        criteria.touched == null ? null : new Date().getTime() - criteria.touched,
+                        criteria.touched == null ? null : new Date().getTime() - criteria.touched * 3600 * 1000L,
                         SEARCH_LIMIT_DEVICE, state.offset);
                 EntityLog.log(context, "Boundary device" +
                         " account=" + account +
@@ -819,7 +819,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
         }
 
         if (criteria.touched != null) {
-            if (message.last_attempt == null || message.last_attempt < new Date().getTime() - criteria.touched)
+            if (message.last_attempt == null || message.last_attempt < new Date().getTime() - criteria.touched * 3600 * 1000L)
                 return false;
         }
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogSearch.java b/app/src/main/java/eu/faircode/email/FragmentDialogSearch.java
index 8340607ac2..ae8edfd693 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogSearch.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogSearch.java
@@ -65,7 +65,7 @@ import java.util.List;
 
 public class FragmentDialogSearch extends FragmentDialogBase {
     private static final int MAX_SUGGESTIONS = 3;
-    private static final int RECENTLY_TOUCHED = 3600 * 1000; // milliseconds
+    private static final int RECENTLY_TOUCHED = 7 * 24; // hours
 
     @NonNull
     @Override