diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index ac94ca2..3320f6f 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -627,7 +627,9 @@
     (interactive)
     (shell-command "muchsync ag")
     (nm-refresh))
-  (setq mail-specify-envelope-from t
+  (setq message-kill-buffer-on-exit t
+        mail-host-address "adamgoldsmith.name"
+        mail-specify-envelope-from t
         message-sendmail-envelope-from 'header
         message-send-mail-function 'message-send-mail-with-sendmail
         sendmail-program "/usr/bin/msmtp"