2 files changed, 16 insertions, 3 deletions
diff --git a/gnus.org b/gnus.org
index a8abd89..7430913 100644
--- a/gnus.org
+++ b/gnus.org
@@ -281,8 +281,9 @@
       '(setq message-draft-headers (remove 'Date message-draft-headers)))
   #+END_SRC
 * Add-ons
-*** icalendar
+*** icalendar/org
     #+begin_src emacs-lisp
+      (require 'ol-gnus)
       (use-package gnus-icalendar
         :demand t
         :init (setq gnus-icalendar-org-capture-file
@@ -412,7 +413,7 @@
              (expiry-wait . 1)
              (jao-gnus--trash-group nil)
              (expiry-target . delete))
-            ("^nnimap:jao/inbox"
+            ("^nnimap:.*/\\(inbox\\|hacking\\)"
              (gcc-self . t))
             ("^nnimap:bigml/.*"
              (posting-style (address "jao@bigml.com"))
@@ -450,6 +451,7 @@
             gnus-suppress-duplicates t
             gnus-summary-ignored-from-addresses jao-mails-regexp
             gnus-process-mark-toggle t
+            gnus-refer-thread-use-search t
             gnus-auto-select-next 'almost-quietly)
 
       (setq gnus-show-threads t
diff --git a/w3m.org b/w3m.org
index ef1b105..da05463 100644
--- a/w3m.org
+++ b/w3m.org
@@ -69,7 +69,18 @@
    #+end_src
 * Email
   #+begin_src emacs-lisp
-    (setq mm-text-html-renderer 'w3m)
+   (defun jao-w3m-gnus-html-renderer (handle)
+     (let ((w3m-message-silent t)
+           (mm-w3m-safe-url-regexp nil)
+           (shr-use-colors nil)
+           (shr-use-fonts nil)
+           (fill-column (min (window-width) 110)))
+       (condition-case nil
+           (mm-inline-text-html-render-with-w3m handle)
+         (error (delete-region (point) (point-max))
+                (mm-shr handle)))))
+
+   (setq mm-text-html-renderer #'jao-w3m-gnus-html-renderer)
   #+end_src
 * Narrowing
   #+begin_src emacs-lisp