diff --git a/mail/.config/afew/config b/mail/.config/afew/config
index 414500c..6d36472 100644
--- a/mail/.config/afew/config
+++ b/mail/.config/afew/config
@@ -33,13 +33,13 @@ message = jira message
 
 # CMT
 [Filter.4]
-query = '[CMT]'
-tags = +cmt;+uucc
+query = 'to:emacs-orgmode@gnu.org'
+tags = +orgmode;-inbox;-unread
 message = cmt uucc message
 
 # Delete Office465/Microsoft messages
 [Filter.5]
-query = '\'Office365 Message Center\' via Developers
+query = '\'Office365 Message Center\' via Developers'
 tags = +ms;+ffjunk;-inbox;-new;-unread;+uucc
 message = cmt uucc message