From 5a9ac630be3b7a33661b0d5a3fbc2573f0c07f08 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 30 Jan 2020 13:20:03 +0100
Subject: [PATCH] Reset folder keywords on clear local messages

---
 .../eu/faircode/email/FragmentFolders.java    | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentFolders.java b/app/src/main/java/eu/faircode/email/FragmentFolders.java
index 11dd85ac6f..8f9f71e806 100644
--- a/app/src/main/java/eu/faircode/email/FragmentFolders.java
+++ b/app/src/main/java/eu/faircode/email/FragmentFolders.java
@@ -575,10 +575,22 @@ public class FragmentFolders extends FragmentBase {
                 Log.i("Delete local messages browsed=" + browsed);
 
                 DB db = DB.getInstance(context);
-                if (browsed)
-                    db.message().deleteBrowsedMessages(fid);
-                else
-                    db.message().deleteLocalMessages(fid);
+
+                try {
+                    db.beginTransaction();
+
+                    if (browsed)
+                        db.message().deleteBrowsedMessages(fid);
+                    else {
+                        db.message().deleteLocalMessages(fid);
+                        db.folder().setFolderKeywords(fid, DB.Converters.fromStringArray(null));
+                    }
+
+                    db.setTransactionSuccessful();
+                } finally {
+                    db.endTransaction();
+                }
+
                 return null;
             }