diff --git a/emacs.el b/emacs.el
index def8971..2fed458 100644
--- a/emacs.el
+++ b/emacs.el
@@ -5,9 +5,7 @@
 (if (fboundp 'slime-setup) (slime-setup))
 
 (setq user-full-name "Gabriel Ebner"
-      user-mail-address "gebner@2b7e.org"
-
-      mail-host-address "mail.2b7e.org")
+      user-mail-address "gebner@2b7e.org")
 
 (autoload 'run-haskell "inf-haskell"
   "Start an inferior haskell buffer." t)
diff --git a/notmuch-config.el b/notmuch-config.el
index 55252a5..57af1f0 100644
--- a/notmuch-config.el
+++ b/notmuch-config.el
@@ -1,9 +1,7 @@
-(custom-set-variables
-  '(mm-text-html-renderer 'w3m)
-  '(send-mail-function 'sendmail-send-it)
-  '(sendmail-program "sendmail")
-  '(message-kill-buffer-on-exit t)
-  '(notmuch-search-oldest-first nil))
+(setq mm-text-html-renderer 'w3m
+      send-mail-function 'sendmail-send-it
+      message-kill-buffer-on-exit t
+      notmuch-search-oldest-first nil)
 
 ; swap r and R
 (define-key notmuch-show-mode-map "r" 'notmuch-show-reply)
@@ -11,12 +9,12 @@
 (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))
+(setq 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))
+(setq mail-specify-envelope-from t
+      mail-envelope-from 'header
+      message-sendmail-f-is-evil nil
+      message-sendmail-envelope-from 'header)