From 9ea63d927e650ccb31b581faa5ff32f3cb416723 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 26 Dec 2019 19:13:41 +0100
Subject: [PATCH] Fixed global search

---
 app/src/main/java/eu/faircode/email/DaoMessage.java | 2 +-
 app/src/main/res/values/strings.xml                 | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/DaoMessage.java b/app/src/main/java/eu/faircode/email/DaoMessage.java
index 861fb0ec24..c8819f7766 100644
--- a/app/src/main/java/eu/faircode/email/DaoMessage.java
+++ b/app/src/main/java/eu/faircode/email/DaoMessage.java
@@ -65,7 +65,7 @@ public interface DaoMessage {
             " LEFT JOIN identity ON identity.id = message.identity" +
             " JOIN folder ON folder.id = message.folder" +
             " WHERE account.`synchronize`" +
-            " AND (:threading OR (:type IS NULL AND folder.unified) OR (:type IS NOT NULL AND folder.type = :type))" +
+            " AND (:threading OR (:type IS NULL AND (folder.unified OR :found)) OR (:type IS NOT NULL AND folder.type = :type))" +
             " AND (NOT message.ui_hide OR :debug)" +
             " AND (NOT :found OR ui_found = :found)" +
             " GROUP BY account.id, CASE WHEN message.thread IS NULL OR NOT :threading THEN message.id ELSE message.thread END" +
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c850308ab7..d08d4ddc53 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -659,7 +659,11 @@
     <string name="title_reporting_why">Error reporting will help improve FairEmail</string>
 
     <string name="title_ask_review" translatable="false">Please review FairEmail</string>
-    <string name="title_ask_review_rationale" translatable="false">You have been using FairEmail for a while. It is appreciated if you rate FairEmail in the Play Store, also to maintain a balance between unfavorable and favorable reviews.</string>
+    <string name="title_ask_review_rationale" translatable="false">
+        You have been using FairEmail for a while.
+        It would be appreciated if you could rate FairEmail in the Play Store.
+        This will help to maintain a balance between unfavorable and favorable reviews.
+    </string>
 
     <string name="title_expand_warning">Expanding this message will download %1$s</string>
     <string name="title_download_message">Downloading &#8230;</string>