diff --git a/emacs/init.el b/emacs/init.el
index 3887354..ca48f47 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -65,6 +65,11 @@
            message-sendmail-extra-arguments '("-a" ,name)
            message-signature-file ,signature)))
 
+(defmacro oni:email (user at host dot com)
+  "Turn arguments into an email address."
+  (concat (symbol-name user) "@" (symbol-name host) "."
+          (symbol-name com)))
+
 (defmacro oni:generic-outline (regex)
   "Prepare for enabling `outline-minor-mode'."
   `(progn
@@ -213,16 +218,19 @@ for easy selection."
               "  :EMAIL: %(mu4e-view-snarf-from 'email)\n"
               "  :END:"))))
 
-(oni:define-mailbox
- "aethon" "thomas@aethon.nl"
+(oni:define-mailbox "aethon"
+                    (oni:email thomas at aethon dot nl)
  (expand-file-name "~/documents/work/aethon/signature.txt"))
-(oni:define-mailbox "gmail" "ryuslash@gmail.com")
-(oni:define-mailbox "ninthfloor" "ryuslash@ninthfloor.org")
-(oni:define-mailbox "ryuslash" "tom@ryuslash.org" nil "ryuslash.org")
+(oni:define-mailbox "gmail" (oni:email ryuslash at gmail dot com))
+(oni:define-mailbox "ninthfloor"
+                    (oni:email ryuslash at ninthfloor dot org))
+(oni:define-mailbox "ryuslash" (oni:email tom at ryuslash dot org)
+                    nil "ryuslash.org")
 
 (setq-default c-basic-offset 4)
 (setq-default fci-rule-column 73)
 
+(setq avandu-article-render-function #'avandu-view-w3m)
 (setq fci-rule-color "darkred")
 (setq inferior-lisp-program "sbcl")
 (setq jabber-account-list '(("ryuslash@jabber.org")))
@@ -243,6 +251,11 @@ for easy selection."
                             (:subject)))
 (setq mu4e-headers-show-threads nil)
 (setq mu4e-headers-sort-revert nil)
+(setq mu4e-my-email-addresses (list
+                               (oni:email tom at ryuslash dot org)
+                               (oni:email ryuslash at gmail dot com)
+                               (oni:email ryuslash at ninthfloor dot org)
+                               (oni:email thomas at aethon dot nl)))
 (setq package-archives
       '(("melpa" . "http://melpa.milkbox.net/packages/")
         ("ELPA" . "http://tromey.com/elpa/")