diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index 249c8d4..9664176 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -276,6 +276,15 @@ This is currently the data directory under the
   :interactive)
 (add-to-list 'auto-mode-alist '("\\.mbsyncrc\\'" . mbsync-conf-mode))
 
+;;;;; Msmtprc mode:
+
+(ensure-library msmtprc-mode
+  :path "vendor-lisp/msmtprc-mode")
+(autoload 'msmtprc-mode "msmtprc-mode"
+  "Major mode for editing msmtp configuration files."
+  :interactive)
+(add-to-list 'auto-mode-alist '("\\.msmtprc\\'" . msmtprc-mode))
+
 ;;;;; Git commit mode:
 
 ;; Enable `electric-quote-local-mode' to easily type nice-looking
diff --git a/emacs/.emacs.d/vendor-lisp/msmtprc-mode/msmtprc-mode.el b/emacs/.emacs.d/vendor-lisp/msmtprc-mode/msmtprc-mode.el
new file mode 100644
index 0000000..33649d6
--- /dev/null
+++ b/emacs/.emacs.d/vendor-lisp/msmtprc-mode/msmtprc-mode.el
@@ -0,0 +1,50 @@
+;;; msmtprc-mode.el --- Major mode for editing msmtp configurations  -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2016  Tom Willemse
+
+;; Author: Tom Willemse <chelys@drd>
+;; Keywords:
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; This library defines a simplisting major mode for editing .msmtprc
+;; files.
+
+;;; Code:
+
+;;;###autoload
+(define-generic-mode msmtprc-mode
+  '(?#)
+  '("defaults" "host" "port" "timeout" "proxy_host" "proxy_port" "domain" "auth"
+    "user" "password" "passwordeval" "ntlmdomain" "tls" "tls_starttls"
+    "tls_trust_file" "tls_crl_file" "tls_fingerprint" "tls_key_file"
+    "tls_cert_file" "tls_certcheck" "tls_min_dh_prime_bits" "tls_priorities"
+    "from" "auto_from" "maildomain" "dsn_notify" "dsn_return"
+    "add_missing_from_header" "add_missing_date_header" "remove_bcc_headers"
+    "logfile" "syslog" "aliases")
+  `(("account" (0 font-lock-keyword-face)
+     (".*" nil nil (0 font-lock-type-face)))
+    (,(rx (or "on" "off" "plain" "scram-sha-1" "cram-md5" "digest-md5" "login"
+              "ntlm" "external" "gssapi"))
+     . font-lock-constant-face)
+    ("protocol" (0 font-lock-keyword-face)
+     (,(rx (or "smtp" "lmtp")) nil nil (0 font-lock-constant-face))))
+  '("\\.msmtprc\\'")
+  nil
+  "A major mode for editing mbsync configuration files.")
+
+(provide 'msmtprc-mode)
+;;; msmtprc-mode.el ends here