Keep local keywords

app/src/main/java/eu/faircode/email/Core.java

@@ -701,14 +701,12 @@ class Core {
         if (TextUtils.isEmpty(keyword))
             throw new IllegalArgumentException("keyword/empty");
 
-        if (!ifolder.getPermanentFlags().contains(Flags.Flag.USER)) {
-            db.message().setMessageKeywords(message.id, DB.Converters.fromStringArray(null));
-            return;
-        }
-
         if (message.uid == null)
             throw new IllegalArgumentException("keyword/uid");
 
+        if (!ifolder.getPermanentFlags().contains(Flags.Flag.USER))
+            return;
+
         Message imessage = ifolder.getMessageByUID(message.uid);
         if (imessage == null)
             throw new MessageRemovedException();
@@ -2916,7 +2914,8 @@ class Core {
                 Log.i(folder.name + " updated id=" + message.id + " uid=" + message.uid + " flags=" + flags);
             }
 
-            if (!Helper.equal(message.keywords, keywords)) {
+            if (!Helper.equal(message.keywords, keywords) &&
+                    ifolder.getPermanentFlags().contains(Flags.Flag.USER)) {
                 update = true;
                 message.keywords = keywords;
                 Log.i(folder.name + " updated id=" + message.id + " uid=" + message.uid +