email: sneak message-dont-reply-to-names in notmuch-mua

1 files changed, 22 insertions, 3 deletions

diff --git a/email.org b/email.org
index a4592e2..3d57d0c 100644
--- a/email.org
+++ b/email.org
@@ -63,7 +63,7 @@
 
       (setq message-expand-name-standard-ui t)
     #+end_src
-*** To->From and Bcc
+*** Adjust Bcc
     #+begin_src emacs-lisp
       (defvar jao-message--bcc-rx (regexp-opt '("mail.io" "gnu.org")))
 
@@ -73,7 +73,9 @@
             (insert "Bcc: proton@jao.io\n"))))
 
       (add-hook 'message-header-setup-hook #'jao-message-insert-bcc)
-
+    #+end_src
+*** To->From and Bcc
+    #+begin_src emacs-lisp
       (defvar jao-message-to-from nil)
 
       (defun jao-message-adjust-from ()
@@ -85,7 +87,24 @@
               (widen)
               (message-replace-header "From" from)))))
 
-      (add-hook 'message-header-setup-hook #'jao-message-adjust-from)
+      (when jao-notmuch-enabled
+        (add-hook 'message-header-setup-hook #'jao-message-adjust-from))
+    #+end_src
+*** Clean-up reply addresses
+    #+begin_src emacs-lisp
+      (defun jao-message--dont-reply (mail)
+        (unless (string-match-p message-dont-reply-to-names mail) mail))
+
+      (defun jao-message-strip-replies ()
+        (dolist (header '("To" "Cc"))
+          (when-let ((v (message-fetch-field header)))
+            (let* ((v (message-tokenize-header v))
+                   (vs (delq nil (mapcar #'jao-message--dont-reply v)))
+                   (v (when vs (mapconcat #'string-trim vs ", "))))
+              (message-replace-header header v)))))
+
+      (when jao-notmuch-enabled
+        (add-hook 'message-setup-hook #'jao-message-strip-replies))
 
     #+end_src
 *** Encryption