Use message-mode's message-cite-original function to create the quoted body for reply messages. In order to make this act like the existing notmuch defaults, you will need to set the following in your emacs configuration: message-citation-line-format "On %a, %d %b %Y, %f wrote:" message-citation-line-function 'message-insert-formatted-citation-line The test has been updated to reflect the (ugly) emacs default. --- Here is an alternate version of the patch, which uses message-cite-original. I suggest people try out this version and see if the behavior is acceptable with some configuration tweaks. If it is, then we can work on implementing the notmuch-emacs config file idea, and go with this version. As I mentioned, the one thing I haven't figured out how to do with configuration is make message-cite-original fill the quoted message. This would probably be a dealbreaker for me, but I suspect it can be done somehow with the right combination of hooks. emacs/notmuch-mua.el | 32 +++++++++++++++++++------------- test/emacs | 3 ++- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el index 5ae0ccf..45c314d 100644 --- a/emacs/notmuch-mua.el +++ b/emacs/notmuch-mua.el @@ -21,6 +21,7 @@ (require 'json) (require 'message) +(require 'format-spec) (require 'notmuch-lib) (require 'notmuch-address) @@ -134,19 +135,24 @@ list." (forward-line -1) (goto-char (point-max))) - (insert (format "On %s, %s wrote:\n" - (cdr (assq 'date original-headers)) - (cdr (assq 'from original-headers)))) - - (if plain-parts - (mapc (lambda (part) (notmuch-mua-insert-part-quoted part)) plain-parts) - (mapc (lambda (part) - (notmuch-mua-insert-part-quoted (notmuch-mua-parse-html-part part))) - html-parts)) - - (push-mark)) - (set-buffer-modified-p nil)) - + (let ((from (cdr (assq 'from original-headers))) + (date (cdr (assq 'date original-headers))) + (start (point))) + + (insert "From: " from "\n") + (insert "Date: " date "\n\n") + + (if plain-parts + (mapc 'insert plain-parts) + (mapc (lambda (part) + (insert (notmuch-mua-parse-html-part part))) + html-parts)) + (push-mark) + (goto-char start) + (message-cite-original)))) + + (push-mark) + (set-buffer-modified-p nil) (message-goto-body)) (defun notmuch-mua-forward-message () diff --git a/test/emacs b/test/emacs index ac47b16..aecbf41 100755 --- a/test/emacs +++ b/test/emacs @@ -268,7 +268,8 @@ Subject: Re: Testing message sent via SMTP In-Reply-To: <XXX> Fcc: $(pwd)/mail/sent --text follows this line-- -On 01 Jan 2000 12:00:00 -0000, Notmuch Test Suite <test_suite@notmuchmail.org> wrote: +Notmuch Test Suite <test_suite@notmuchmail.org> writes: + > This is a test that messages are sent via SMTP EOF test_expect_equal_file OUTPUT EXPECTED -- 1.7.5.4