diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index d4be1dda88..a1d8ce4d3f 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1232,6 +1232,38 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
                                     }.load(context, owner, args);
                                 }
                             })
+                            .setNeutralButton(R.string.title_add, new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int which) {
+                                    final EditText etKeyword = new EditText(context);
+                                    new DialogBuilderLifecycle(context, owner)
+                                            .setTitle(R.string.title_add)
+                                            .setView(etKeyword)
+                                            .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+                                                @Override
+                                                public void onClick(DialogInterface dialog, int which) {
+                                                    String keyword = Helper.sanitizeKeyword(etKeyword.getText().toString());
+                                                    if (!TextUtils.isEmpty(keyword)) {
+                                                        args.putString("keyword", keyword);
+
+                                                        new SimpleTask<Void>() {
+                                                            @Override
+                                                            protected Void onLoad(Context context, Bundle args) throws Throwable {
+                                                                EntityMessage message = (EntityMessage) args.getSerializable("message");
+                                                                String keyword = args.getString("keyword");
+
+                                                                DB db = DB.getInstance(context);
+                                                                EntityOperation.queue(db, message, EntityOperation.KEYWORD, keyword, true);
+                                                                EntityOperation.process(context);
+
+                                                                return null;
+                                                            }
+                                                        }.load(context, owner, args);
+                                                    }
+                                                }
+                                            }).show();
+                                }
+                            })
                             .show();
                 }
             }.load(context, owner, args);
diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index e5fdcc5954..75036c7676 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -1500,7 +1500,7 @@ public class ServiceSynchronize extends LifecycleService {
         }
 
         // https://tools.ietf.org/html/rfc3501#section-2.3.2
-        String keyword = Helper.sanitizeKeyword(jargs.getString(0));
+        String keyword = jargs.getString(0);
         boolean set = jargs.getBoolean(1);
 
         Message imessage = ifolder.getMessageByUID(message.uid);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dc9eb289b9..3731416d8e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -333,6 +333,7 @@
     <string name="title_yes">Yes</string>
     <string name="title_no">No</string>
     <string name="title_undo">Undo</string>
+    <string name="title_add">Add</string>
 
     <string name="title_try">Try FairEmail, an open source, privacy friendly email app for Android</string>