From 819a4ace72be08fc3c4e11a1b6db0415d0455bd8 Mon Sep 17 00:00:00 2001
From: Jez Cope <j.cope@erambler.co.uk>
Date: Thu, 21 Oct 2021 22:21:28 +0100
Subject: [PATCH] emacs: fix mail sending via msmtp

---
 home/profiles/emacs/doom.d/config.org | 33 ++++++++++++++-------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/home/profiles/emacs/doom.d/config.org b/home/profiles/emacs/doom.d/config.org
index fdd34cf..8d93f0e 100644
--- a/home/profiles/emacs/doom.d/config.org
+++ b/home/profiles/emacs/doom.d/config.org
@@ -729,13 +729,9 @@ See also [[id:18709859-c3db-4d0e-a4a0-e797b58a2e07][Capture templates]]
 
 ** Mail
 
-*** Reading
+*** Accounts
 
 #+begin_src emacs-lisp
-  (defun jc/make-refile-folder (msg)
-    (format-time-string "/main/Archives.%Y"
-                        (mu4e-msg-field msg :date)))
-
   (set-email-account!
    "main"
    `((user-full-name         . "Jez Cope")
@@ -745,12 +741,16 @@ See also [[id:18709859-c3db-4d0e-a4a0-e797b58a2e07][Capture templates]]
      (mu4e-drafts-folder     . "/main/Drafts")
      (mu4e-trash-folder      . "/main/Trash")
      (mu4e-sent-folder       . "/main/Sent")
-     (mu4e-refile-folder     . jc/make-refile-folder)
-
-     (smtpmail-smtp-server   . "mail.jeznelly.co.uk")
-     (smtpmail-stream-type   . starttls)
-     (smtpmail-smtp-service  . 587))
+     (mu4e-refile-folder     . jc/make-refile-folder))
    t)
+#+end_src
+
+*** Reading
+
+#+begin_src emacs-lisp
+  (defun jc/make-refile-folder (msg)
+    (format-time-string "/main/Archives.%Y"
+                        (mu4e-msg-field msg :date)))
 
   (setq mu4e-split-view 'vertical
         mu4e-headers-visible-columns 80
@@ -818,12 +818,13 @@ See also [[id:18709859-c3db-4d0e-a4a0-e797b58a2e07][Capture templates]]
 *** Sending
 
 #+begin_src emacs-lisp
-  (setq sendmail-program (executable-find "msmtp")
-        send-mail-function #'smtpmail-send-it
-        message-sendmail-f-is-evil t
-        message-sendmail-extra-arguments '("--read-envelope-from")
-        message-send-mail-function #'message-send-mail-with-sendmail
-        mu4e-compose--org-msg-toggle-next nil)
+  (after! mu4e
+    (setq sendmail-program (executable-find "msmtp")
+          send-mail-function #'smtpmail-send-it
+          message-sendmail-f-is-evil t
+          message-sendmail-extra-arguments '("--read-envelope-from")
+          message-send-mail-function #'message-send-mail-with-sendmail
+          mu4e-compose--org-msg-toggle-next nil))
 #+end_src
 
 * Languages/modes