From 83fb4bd6d099fa3d8a74afc92b98103c8cc8a9a5 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 16 Dec 2019 10:49:54 +0100
Subject: [PATCH 1/2] Fixed browse/search interaction

---
 .../main/java/eu/faircode/email/BoundaryCallbackMessages.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
index 2c683c5647..d34406c892 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -489,7 +489,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                                     rules, null);
                             found++;
                         }
-                        if (message != null)
+                        if (message != null && query != null)
                             if (threading)
                                 db.message().setMessageFound(message.account, message.thread);
                             else

From e7830366c8c74c6aab83558c6872aef1213f8286 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 16 Dec 2019 11:15:06 +0100
Subject: [PATCH 2/2] Small behavior improvement

---
 app/src/main/java/eu/faircode/email/FragmentMessages.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 7fa1c289aa..8c243787cc 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -2765,8 +2765,11 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                 (viewType == AdapterMessage.ViewType.UNIFIED && !EntityFolder.DRAFTS.equals(type)) ||
                         (viewType == AdapterMessage.ViewType.FOLDER && !EntityFolder.DRAFTS.equals(type));
 
-        menu.findItem(R.id.menu_search).setVisible(
+        MenuItem menuSearch = menu.findItem(R.id.menu_search);
+        menuSearch.setVisible(
                 viewType == AdapterMessage.ViewType.UNIFIED || viewType == AdapterMessage.ViewType.FOLDER);
+        if (!menuSearch.isVisible())
+            menuSearch.collapseActionView();
 
         menu.findItem(R.id.menu_folders).setVisible(viewType == AdapterMessage.ViewType.UNIFIED && primary >= 0);
         ImageButton ib = (ImageButton) menu.findItem(R.id.menu_folders).getActionView();