diff --git a/app/src/main/java/eu/faircode/email/EntityOperation.java b/app/src/main/java/eu/faircode/email/EntityOperation.java
index bc62a16d26..b8e500a120 100644
--- a/app/src/main/java/eu/faircode/email/EntityOperation.java
+++ b/app/src/main/java/eu/faircode/email/EntityOperation.java
@@ -156,7 +156,8 @@ public class EntityOperation {
                     keywords.add(keyword);
                 Collections.sort(keywords);
 
-                db.message().setMessageKeywords(message.id, DB.Converters.fromStringArray(keywords.toArray(new String[0])));
+                message.keywords = keywords.toArray(new String[0]);
+                db.message().setMessageKeywords(message.id, DB.Converters.fromStringArray(message.keywords));
 
             } else if (LABEL.equals(name)) {
                 String label = jargs.getString(0);