diff --git a/home/emacs.nix b/home/emacs.nix
index 359ffec..7e244fe 100644
--- a/home/emacs.nix
+++ b/home/emacs.nix
@@ -550,6 +550,13 @@ in
                           account-vars)
                   (error "No email account found"))))
 
+            (setq mu4e-bookmarks
+                  '((:name "Unread messages" :query "flag:unread AND NOT (flag:trashed OR maildir:/feeds)" :key ?u)
+                   (:name "Today's messages" :query "date:today..now AND NOT maildir:/feeds" :key ?t)
+                   (:name "Last 7 days" :query "date:7d..now AND NOT maildir:/feeds" :key ?w)
+                   (:name "Feed" :query "maildir:/feeds" :key ?f)
+                   (:name "XKCD" :query "list:xkcd.localhost" :key ?x)))
+
             (add-hook 'mu4e-compose-pre-hook 'my-mu4e-set-account)
 
           '';
diff --git a/home/feeds.nix b/home/feeds.nix
index 0819e0d..5cbd0b3 100644
--- a/home/feeds.nix
+++ b/home/feeds.nix
@@ -2,26 +2,26 @@
 
 let
   feeds = {
-    xkcd = "http://xkcd.com/atom.xml";
     dailywtf = "http://syndication.thedailywtf.com/TheDailyWtf";
-    nixos = "https://weekly.nixos.org/feeds/all.rss.xml";
-    rust = "https://blog.rust-lang.org/feed.xml";
+    devto = "https://dev.to/feed/";
     insiderust = "https://blog.rust-lang.org/inside-rust/feed.xml";
     kdb424 = "https://blog.kdb424.xyz/atom.xml";
-    devto = "https://dev.to/feed/";
+    nixos = "https://weekly.nixos.org/feeds/all.rss.xml";
+    rust = "https://blog.rust-lang.org/feed.xml";
+    xkcd = "http://xkcd.com/atom.xml";
   };
 
   rss2emailConfig = {
-    html-mail = "True";
-    date-header = "True";
-    from = "rss2email@home.localhost";
-    force-from = "False";
-    use-publisher-email = "True";
     active = "true";
-    to = "willem@home.localhost";
+    date-header = "True";
     email-protocol = "maildir";
+    force-from = "False";
+    from = "rss2email@home.localhost";
+    html-mail = "True";
     maildir-mailbox = "feeds";
     maildir-path = config.home.sessionVariables.MAILDIR;
+    to = "willem@home.localhost";
+    use-publisher-email = "True";
   };
 
   mkFeedString = name: url: ''