From a8e433db83492d30c5ffab1ed3899537c4a92801 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 9 Aug 2020 16:56:55 +0200
Subject: [PATCH] Limit Gmail raw search to archive folder only

---
 .../main/java/eu/faircode/email/BoundaryCallbackMessages.java  | 3 ++-
 1 file changed, 2 insertions(+), 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 d3312ed928..e2597a2c61 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -378,7 +378,8 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                                 // https://tools.ietf.org/html/rfc3501#section-6.4.4
                                 if (criteria.query != null &&
                                         criteria.query.startsWith("raw:") &&
-                                        state.iservice.hasCapability("X-GM-EXT-1")) {
+                                        state.iservice.hasCapability("X-GM-EXT-1") &&
+                                        EntityFolder.ARCHIVE.equals(browsable.type)) {
                                     // https://support.google.com/mail/answer/7190
                                     // https://developers.google.com/gmail/imap/imap-extensions#extension_of_the_search_command_x-gm-raw
                                     Log.i("Boundary raw search=" + criteria.query);