diff --git a/emacs.el b/emacs.el
index 28c600e..def8971 100644
--- a/emacs.el
+++ b/emacs.el
@@ -39,3 +39,5 @@
  (cons '("\\.ebuild\\'" . ebuild-mode)
        (cons '("\\.eclass\\'" . ebuild-mode)
 	     auto-mode-alist)))
+
+(eval-after-load "notmuch" '(load "~/etc/notmuch-config.el"))
diff --git a/notmuch-config.el b/notmuch-config.el
new file mode 100644
index 0000000..e72b8cf
--- /dev/null
+++ b/notmuch-config.el
@@ -0,0 +1,21 @@
+(custom-set-variables
+  '(mm-text-html-renderer 'w3m)
+  '(send-mail-function 'sendmail-send-it)
+  '(sendmail-program "sendmail")
+  '(message-kill-buffer-on-exit t))
+
+; swap r and R
+(define-key notmuch-show-mode-map "r" 'notmuch-show-reply)
+(define-key notmuch-show-mode-map "R" 'notmuch-show-reply-sender)
+(define-key notmuch-search-mode-map "r" 'notmuch-search-reply-to-thread)
+(define-key notmuch-search-mode-map "R" 'notmuch-search-reply-to-thread-sender)
+
+(custom-set-variables '(notmuch-fcc-dirs nil))
+(add-hook 'message-header-setup-hook 'notmuch-bcc-header-setup)
+(defun notmuch-bcc-header-setup ()
+  (message-add-header "Bcc: gebner@gebner.org"))
+
+(custom-set-variables
+  '(mail-specify-envelope-from t)
+  '(message-sendmail-envelope-from 'header)
+  '(mail-envelope-from 'header))