From 990a24e3916faafd517e8cb47bbce2d786cdd8e6 Mon Sep 17 00:00:00 2001
From: Gergely Polonkai <gergely@polonkai.eu>
Date: Tue, 9 Mar 2021 17:51:13 +0100
Subject: [PATCH] More Mu4e/Sendmail tweaking

---
 configuration.org | 23 +++++++++++++++++++----
 customizations.el |  2 --
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/configuration.org b/configuration.org
index e78dd7f..1f4ba54 100644
--- a/configuration.org
+++ b/configuration.org
@@ -2353,7 +2353,8 @@ accompanying function will be added to ~mu4e-view-mode-hook~.
                      (mu4e-sent-folder . "/Polonkai/[Gmail].Sendur p&APM-stur")
                      (mu4e-drafts-folder . "/Polonkai/[Gmail].Dr&APY-g")
                      (mu4e-trash-folder . "/Polonkai/[Gmail].Rusl")
-                     (mu4e-refile-folder . "/Polonkai/[Gmail].Dr&APY-g")))
+                     (mu4e-refile-folder . "/Polonkai/[Gmail].Dr&APY-g")
+                     (message-sendmail-extra-arguments . ("--account=polonkai"))))
            ,(make-mu4e-context
              :name "Benchmark.games"
              :enter-func (lambda () (mu4e-message "Entering Benchmark.games Context"))
@@ -2374,7 +2375,8 @@ accompanying function will be added to ~mu4e-view-mode-hook~.
                      (mu4e-sent-folder . "/GT2/[Gmail].Sent Mail")
                      (mu4e-drafts-folder . "/GT2/[Gmail].Drafts")
                      (mu4e-trash-folder . "/GT2/[Gmail].Trash")
-                     (mu4e-refile-folder . "/GT2/[Gmail].Drafts")))
+                     (mu4e-refile-folder . "/GT2/[Gmail].Drafts")
+                     (message-sendmail-extra-arguments . ("--account=gt2"))))
            ,(make-mu4e-context
              :name "Private"
              :enter-func (lambda () (mu4e-message "Entering Private Context"))
@@ -2386,10 +2388,11 @@ accompanying function will be added to ~mu4e-view-mode-hook~.
                      (mu4e-sent-folder . "/Private/Sent")
                      (mu4e-drafts-folder . "/Private/Drafts")
                      (mu4e-trash-folder . "/Private/Trash")
-                     (mu4e-refile-folder . "/Private/Drafts"))))
+                     (mu4e-refile-folder . "/Private/Drafts")
+                     (message-sendmail-extra-arguments . ("--account=private" "--read-envelope-from")))))
         org-mu4e-link-query-in-headers-mode nil)
   :custom
-  (mu4e-completing-read-function ivy-completing-read)
+  (mu4e-completing-read-function 'ivy-completing-read)
   (mu4e-context-policy 'pick-first)
   (mu4e-confirm-quit nil)
   (mail-user-agent 'sendmail-user-agent)
@@ -2411,6 +2414,18 @@ accompanying function will be added to ~mu4e-view-mode-hook~.
   (mu4e-maildirs-extension-custom-list '("INBOX")))
 #+END_SRC
 
+*** Also, some sendmail hacking
+
+#+begin_src emacs-lisp
+(use-package sendmail
+  :custom
+  (sendmail-program "/usr/bin/msmtp")
+  (message-sendmail-f-is-evil t)
+  (message-sendmail-extra-arguments '("--read-envelope-from"))
+  (send-mail-function 'sendmail-send-it)
+  (message-send-mail-function 'message-send-mail-with-sendmail))
+#+end_src
+
 ** ViM’s ~ci~ functionality
 
 #+BEGIN_SRC emacs-lisp
diff --git a/customizations.el b/customizations.el
index 2b70614..8018eb8 100644
--- a/customizations.el
+++ b/customizations.el
@@ -195,8 +195,6 @@
      (engine . jinja)
      (bug-reference-bug-regexp . "#\\(?2:[0-9]+\\)")))
  '(scroll-margin 2)
- '(send-mail-function 'sendmail-send-it)
- '(sendmail-program "/usr/bin/msmtp")
  '(sgml-basic-offset 4)
  '(show-trailing-whitespace t)
  '(suggest-key-bindings nil)