diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 42011f3..efe21ab 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -624,7 +624,12 @@
     "Pull email from remote mailbox"
     (interactive)
     (shell-command "muchsync ag")
-    (nm-refresh)))
+    (nm-refresh))
+  (setq mail-specify-envelope-from t
+        message-sendmail-envelope-from 'header
+        message-send-mail-function 'message-send-mail-with-sendmail
+        sendmail-program "/usr/bin/msmtp"
+        notmuch-fcc-dirs "Sent +sent"))
 
 (use-package fortune-cookie
   :config
diff --git a/.msmtprc b/.msmtprc
new file mode 100644
index 0000000..e0eba23
--- /dev/null
+++ b/.msmtprc
@@ -0,0 +1,31 @@
+# -*- mode: conf; -*-
+
+# Set default values for all following accounts.
+defaults
+  port 587
+  tls on
+  auth on
+
+account adamgoldsmith
+  host adamgoldsmith.name
+  tls_fingerprint 8E:5C:7C:90:19:8A:15:5F:89:F8:2E:6B:CD:D5:6A:31:D1:0E:27:C2:1A:D9:83:94:11:5D:F8:A3:22:F6:F1:34
+  from adam@adamgoldsmith.name
+  user adam
+  passwordeval pass email/adam@adamgoldsmith.name | head -n1
+
+account WPI
+  host submission.wpi.edu
+  tls_fingerprint 63:84:F4:F6:AF:A4:86:64:CA:CC:22:6B:5C:3A:B5:0D:29:1B:46:5A:88:B6:12:99:B6:D9:CA:A9:C3:51:9F:F3
+  from asgoldsmith@wpi.edu
+  user asgoldsmith
+  passwordeval pass websites/wpi.edu | head -n1
+
+account Gmail
+  host smtp.gmail.com
+  tls_trust_file /etc/ssl/certs/ca-certificates.crt
+#  tls_fingerprint CF:FA:5D:9D:18:F6:1D:C6:6A:30:0B:C4:D2:1B:7A:7B:75:29:E6:D5:01:6F:11:63:6D:2D:54:A0:94:74:BF:49
+  from adamgoldsmith1217@gmail.com
+  user adamgoldsmith1217@gmail.com
+  passwordeval pass email/adamgoldsmith1217@gmail.com | head -n1
+
+account default : adamgoldsmith