diff --git a/oni-gnus.el b/oni-gnus.el
index c64220e..d21a737 100644
--- a/oni-gnus.el
+++ b/oni-gnus.el
@@ -4,8 +4,8 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2022.0216.010059
-;; Package-Requires: (oni-data-dir)
+;; Version: 2023.0621.223533
+;; Package-Requires: (oni-data-dir oni-sendmail)
 
 ;; 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
@@ -32,7 +32,7 @@
 (require 'message)
 (require 'nnfolder)
 (require 'oni-data-dir)
-(require 'sendmail)
+(require 'oni-sendmail)
 
 (defun oni-gnus-goto-bracket-then-colon ()
   "Find the first occurrence of [ on the current line and then :.
@@ -61,10 +61,6 @@ of the email."
       message-directory mail-source-directory
       nnfolder-directory mail-source-directory)
 
-(setq send-mail-function 'send-mail-send-it
-      message-send-mail-function 'message-send-mail-with-sendmail
-      sendmail-program "msmtp")
-
 (setq gnus-novice-user nil)
 
 (defun oni-gnus-delete-forward (&optional n)
diff --git a/oni-notmuch.el b/oni-notmuch.el
index 5bd49b5..110afac 100644
--- a/oni-notmuch.el
+++ b/oni-notmuch.el
@@ -4,8 +4,8 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2022.1113.170616
-;; Package-Requires: (notmuch ol-notmuch)
+;; Version: 2023.0621.223804
+;; Package-Requires: (oni-sendmail notmuch ol-notmuch)
 
 ;; 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
@@ -27,6 +27,7 @@
 ;;; Code:
 
 (require 'notmuch)
+(require 'oni-sendmail)
 
 (defun oni-notmuch-search-delete-thread (&optional reverse begin end)
   "Archive and mark all messages in the selected threads for deletion.
diff --git a/oni-sendmail.el b/oni-sendmail.el
new file mode 100644
index 0000000..d45f1d7
--- /dev/null
+++ b/oni-sendmail.el
@@ -0,0 +1,38 @@
+;;; oni-sendmail.el --- Configuration for sending mail  -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2023  Tom Willemse
+
+;; Author: Tom Willemse <tom@ryuslash.org>
+;; Keywords: local
+
+;; 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 <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Configuration for sending mail through Emacs.
+
+;;; Code:
+
+(require 'message)
+(require 'sendmail)
+
+(setq send-mail-function 'send-mail-send-it
+      message-send-mail-function 'message-send-mail-with-sendmail
+      sendmail-program "msmtp"
+      mail-envelope-from 'header
+      message-sendmail-envelope-from 'header
+      mail-specify-envelope-from t)
+
+(provide 'oni-sendmail)
+;;; oni-sendmail.el ends here