emacs: Reuse rather than reinvent message header filtering

[notmuch] / emacs / notmuch-mua.el

diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
index c7a9aee0aa67b471e7a5c346f9bf0297652dfd51..0975fe610415c895965a1a150984fcab9ab9c428 100644 (file)
--- a/emacs/notmuch-mua.el
+++ b/emacs/notmuch-mua.el
@@ -19,7 +19,6 @@
 ;;
 ;; Authors: David Edmondson <dme@dme.org>
 
-(require 'cl)
 (require 'message)
 
 (require 'notmuch-lib)
@@ -92,17 +91,17 @@ list."
        ((same-window-regexps '("\\*mail .*")))
       (notmuch-mua-mail (mail-header 'to headers)
                        (mail-header 'subject headers)
-                       (loop for header in headers
-                             if (not (or (eq 'to (car header))
-                                         (eq 'subject (car header))))
-                             collect header)))
-    (message-sort-headers)
-    (message-hide-headers)
+                       (message-headers-to-generate headers t '(to subject))))
+    ;; insert the message body - but put it in front of the signature
+    ;; if one is present
     (goto-char (point-max))
+    (if (re-search-backward message-signature-separator nil t)
+         (forward-line -1)
+      (goto-char (point-max)))
     (insert body))
-    (set-buffer-modified-p nil)
+  (set-buffer-modified-p nil)
 
-    (message-goto-body))
+  (message-goto-body))
 
 (defun notmuch-mua-forward-message ()
   (message-forward)