Oops

app/src/main/java/eu/faircode/email/DaoMessage.java

@@ -425,8 +425,8 @@ public interface DaoMessage {
     @Query("SELECT thread, msgid, hash, inreplyto FROM message" +
             " WHERE account = :account" +
             " AND (msgid IN (:msgids) OR inreplyto IN (:msgids))" +
-            " AND (:from IS NULL || received > :from)" +
-            " AND (:to IS NULL || received < :to)")
+            " AND (:from IS NULL OR received IS NULL OR received > :from)" +
+            " AND (:to IS NULL OR received IS NULL OR received < :to)")
     List<TupleThreadInfo> getThreadInfo(long account, List<String> msgids, Long from, Long to);
 
     @Query("SELECT * FROM message" +

app/src/main/java/eu/faircode/email/MessageHelper.java

@@ -1489,8 +1489,8 @@ public class MessageHelper {
 
         int thread_range = prefs.getInt("thread_range", MessageHelper.DEFAULT_THREAD_RANGE);
         int range = (int) Math.pow(2, thread_range);
-        Long start = (received == 0 ? null : received - range * 24 * 3600L);
-        Long end = (received == 0 ? null : received + range * 24 * 3600L);
+        Long start = (received == 0 ? null : received - range * 24 * 3600 * 1000L);
+        Long end = (received == 0 ? null : received + range * 24 * 3600 * 1000L);
 
         List<TupleThreadInfo> infos = (all.size() == 0
                 ? new ArrayList<>()