2 files changed, 9 insertions, 9 deletions
diff --git a/email.org b/email.org
index ecb4eb3..ca5d0f7 100644
--- a/email.org
+++ b/email.org
@@ -298,11 +298,6 @@
 
     (jao-consult-add-buffer-source 'jao-mail-consult-source "Mail" ?n)
   #+end_src
-* notmuch
-  #+begin_src emacs-lisp
-    (when (eq jao-afio-mail-function 'notmuch)
-      (jao-load-org "notmuch"))
-  #+end_src
 * gnus
 *** Directories
     #+begin_src emacs-lisp
@@ -320,5 +315,11 @@
                                   'gnus-article-mode
                                   'gnus-group-mode)
             (let ((inhibit-message t))
-              (gnus-demon-scan-news)))))
+              (gnus-demon-scan-news)
+              (gnus-group-expire-all-groups)))))
     #+end_src
+* notmuch
+  #+begin_src emacs-lisp
+    (when (eq jao-afio-mail-function 'notmuch)
+      (jao-load-org "notmuch"))
+  #+end_src
diff --git a/gnus.org b/gnus.org
index 7430913..79f19df 100644
--- a/gnus.org
+++ b/gnus.org
@@ -363,8 +363,7 @@
       (setq jao-gnus--get-count (1+ jao-gnus--get-count))
       (gnus-group-get-new-news (max (if (= 1 jao-gnus--get-count) 4 3)
                                     (or arg 0))))
-    ;; To limit expiration to the `g' count, `jao-gnus--get-count':
-    ;; (remove-hook 'gnus-summary-prepare-exit-hook 'gnus-summary-expire-articles)
+
     ;; (define-key gnus-group-mode-map "g" 'jao-gnus-get-new-news)
 
     (defun jao-gnus-restart-servers ()
@@ -394,7 +393,7 @@
           (format (concat "^nnimap:\\("
                           "\\(bigml/%s\\)\\|"
                           "\\(jao/%s\\)\\|"
-                          "\\(feeds/.+\\)\\|trash\\|spam\\|local"
+                          "\\(feeds/.*\\)\\|trash\\|spam\\|local"
                           "\\)")
                   (regexp-opt '("reports" "deploys" "lists" "drivel" "bugs"))
                   (regexp-opt '("think" "drivel" "lists"))))