diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 07193cf986..586d778ab5 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -1855,14 +1855,19 @@ public class FragmentCompose extends FragmentBase {
                     if (answer.favorite)
                         continue;
                     order++;
+
+                    String name = answer.name;
+                    if (BuildConfig.DEBUG && answer.applied > 0)
+                        name += " ★";
+
+                    MenuItem item;
                     if (answer.group == null)
-                        main.add(Menu.NONE, order, order++, answer.toString())
-                                .setIntent(new Intent().putExtra("id", answer.id));
+                        item = main.add(Menu.NONE, order, order++, name);
                     else {
                         SubMenu smenu = map.get(answer.group);
-                        smenu.add(Menu.NONE, smenu.size(), smenu.size() + 1, answer.toString())
-                                .setIntent(new Intent().putExtra("id", answer.id));
+                        item = smenu.add(Menu.NONE, smenu.size(), smenu.size() + 1, name);
                     }
+                    item.setIntent(new Intent().putExtra("id", answer.id));
                 }
 
                 for (EntityAnswer answer : favorites)
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 47df817a47..2cbaf457aa 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -2682,14 +2682,19 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
                     for (EntityAnswer answer : answers) {
                         order++;
+
+                        String name = answer.name;
+                        if (BuildConfig.DEBUG && answer.applied > 0)
+                            name += " ★";
+
+                        MenuItem item;
                         if (answer.group == null)
-                            main.add(Menu.NONE, order, order++, answer.toString())
-                                    .setIntent(new Intent().putExtra("id", answer.id));
+                            item = main.add(Menu.NONE, order, order++, name);
                         else {
                             SubMenu smenu = map.get(answer.group);
-                            smenu.add(Menu.NONE, smenu.size(), smenu.size() + 1, answer.toString())
-                                    .setIntent(new Intent().putExtra("id", answer.id));
+                            item = smenu.add(Menu.NONE, smenu.size(), smenu.size() + 1, name);
                         }
+                        item.setIntent(new Intent().putExtra("id", answer.id));
                     }
 
                     popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {