X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2Fnotmuch-mua.el;h=bca20db95168e86396c7946e10437f4c1bd95041;hb=6408270512dd654243b81ed57b81dad3f721938c;hp=e9b76f103c01d832bb3bd9eaae84dba047f28f4e;hpb=47f5871aff404990cb059b3da9976971da922b00;p=notmuch

diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
index e9b76f10..bca20db9 100644
--- a/emacs/notmuch-mua.el
+++ b/emacs/notmuch-mua.el
@@ -23,6 +23,7 @@
 (require 'message)
 
 (require 'notmuch-lib)
+(require 'notmuch-address)
 
 ;;
 
@@ -40,6 +41,12 @@
 	     notmuch-mua-user-agent-notmuch
 	     notmuch-mua-user-agent-emacs))
 
+(defcustom notmuch-mua-hidden-headers '("^User-Agent:")
+  "Headers that are added to the `message-mode' hidden headers
+list."
+  :group 'notmuch
+  :type '(repeat string))
+
 ;;
 
 (defun notmuch-mua-user-agent-full ()
@@ -56,6 +63,13 @@
   "Generate a `User-Agent:' string suitable for notmuch."
   (concat "Emacs/" emacs-version " (" system-configuration ")"))
 
+(defun notmuch-mua-add-more-hidden-headers ()
+  "Add some headers to the list that are hidden by default."
+  (mapc (lambda (header)
+	  (when (not (member header 'message-hidden-headers))
+	    (push header message-hidden-headers)))
+	notmuch-mua-hidden-headers))
+
 (defun notmuch-mua-reply (query-string)
   (let (headers body)
     ;; This make assumptions about the output of `notmuch reply', but
@@ -111,6 +125,7 @@
 
   (message-mail to subject other-headers continue
 		switch-function yank-action send-actions)
+  (message-sort-headers)
   (message-hide-headers))
 
 (defun notmuch-mua-send-and-exit (&optional arg)
@@ -132,6 +147,10 @@ simply runs the corresponding `message-mode' hook functions."
   'notmuch-mua-mail 'notmuch-mua-send-and-exit
   'notmuch-mua-kill-buffer 'notmuch-mua-send-hook)
 
+;; Add some more headers to the list that `message-mode' hides when
+;; composing a message.
+(notmuch-mua-add-more-hidden-headers)
+
 ;;
 
 (provide 'notmuch-mua)