diff --git a/mu4e-custom.el b/mu4e-custom.el
index 54080e2..35d65e0 100644
--- a/mu4e-custom.el
+++ b/mu4e-custom.el
@@ -43,8 +43,9 @@
                             (:maildir "/Outlook/Inbox/" :key ?w)))
   (mu4e-bookmarks '((:name "Inbox" :query "maildir:/inbox/" :key ?i :favorite t)
                     (:name "Today" :query "date:today..now AND maildir:/inbox/" :key ?t)
-                    (:name "Flagged" :query "flag:flagged AND NOT flag:trashed AND NOT maildir:/spam/ AND NOT maildir:/junk/" :key ?f)
-                    (:name "Unread" :query "flag:unread AND NOT flag:trashed AND NOT maildir:/archive/ AND NOT maildir:/spam/ AND NOT maildir:/junk/" :key ?u :hide-unread t)
+                    (:name "Drafts" :query "flag:draft AND NOT flag:trashed" :key ?d :hide-unread t)
+                    (:name "Unread" :query "flag:unread AND maildir:/inbox/" :key ?u :hide-unread t)
+                    (:name "Flagged" :query "flag:flagged AND NOT flag:trashed" :key ?f :hide-unread t)
                     (:name "Spam" :query "maildir:/spam/ OR maildir:/junk/" :key ?s :hide-unread t)))
   (mu4e-headers-visible-lines 3)
   (mu4e-headers-fields