From 09e61bebe699c8b34946bcc4c2ef5e7ee9f5f84d Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 13 Aug 2021 18:36:17 +0200
Subject: [PATCH] Fixed server search

---
 .../eu/faircode/email/BoundaryCallbackMessages.java    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
index cf06a6afc0..a4eb922482 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -585,12 +585,12 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                                 (IMAPStore) state.iservice.getStore(), state.ifolder, (MimeMessage) isub[j],
                                 true, true,
                                 rules, astate, null);
-                        if (message != null) // SQLiteConstraintException
-                            if (criteria == null)
-                                found++; // browsed
-                            else
-                                found += db.message().setMessageFound(message.id);
+                        // SQLiteConstraintException
+                        if (message != null && criteria == null)
+                            found++; // browsed
                     }
+                    if (message != null && criteria != null)
+                        found += db.message().setMessageFound(message.id);
                     Log.i("Boundary matched=" + (message == null ? null : message.id) + " found=" + found);
                 } catch (MessageRemovedException | MessageRemovedIOException ex) {
                     Log.w(browsable.name + " boundary server", ex);