diff --git a/system/desktop/mail-stuff.nix b/system/desktop/mail-stuff.nix
index 6c6060d..68054a4 100644
--- a/system/desktop/mail-stuff.nix
+++ b/system/desktop/mail-stuff.nix
@@ -449,10 +449,12 @@ in {
     macro index \\\\ "<vfolder-from-query>"                   # looks up a hand made query
     macro pager \\\\ "<vfolder-from-query>"                   # looks up a hand made query
 
-    macro index + "<modify-labels>+*\n<sync-mailbox>"         # tag as starred
-    macro pager + "<modify-labels>+*\n<sync-mailbox>"         # tag as starred
-    macro index - "<modify-labels>-*\n<sync-mailbox>"         # tag as unstarred
-    macro pager - "<modify-labels>-*\n<sync-mailbox>"         # tag as unstarred
+    macro index + "<modify-labels>+flagged\n<sync-mailbox>"         # tag as starred
+    macro pager + "<modify-labels>+flagged\n<sync-mailbox>"         # tag as starred
+    macro index ! "<modify-labels>+flagged\n<sync-mailbox>"         # tag as starred
+    macro pager ! "<modify-labels>+flagged\n<sync-mailbox>"         # tag as starred
+    macro index - "<modify-labels>-flagged\n<sync-mailbox>"         # tag as unstarred
+    macro pager - "<modify-labels>-flagged\n<sync-mailbox>"         # tag as unstarred
 
     # Address Book
     # ------------