X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2Fnotmuch-mua.el;h=dc7b386f23c32abbba3a8e8ad8966764ce9d0c8c;hb=c51d5b3cdb5ca0816816e88ca6f7136a24e74eee;hp=c7a9aee0aa67b471e7a5c346f9bf0297652dfd51;hpb=e247ae47c10e8f584b7256eef55a5d722f45c0b3;p=notmuch

diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
index c7a9aee0..dc7b386f 100644
--- 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)
@@ -119,6 +118,7 @@ list."
 
 (defun notmuch-mua-mail (&optional to subject other-headers continue
 				   switch-function yank-action send-actions)
+  "Invoke the notmuch mail composition window."
   (interactive)
 
   (when notmuch-mua-user-agent-function
@@ -126,6 +126,10 @@ list."
       (when (not (string= "" user-agent))
 	(push (cons "User-Agent" user-agent) other-headers))))
 
+  (unless (mail-header 'from other-headers)
+    (push (cons "From" (concat
+			(notmuch-user-name) " <" (notmuch-user-primary-email) ">")) other-headers))
+
   (message-mail to subject other-headers continue
 		switch-function yank-action send-actions)
   (message-sort-headers)