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

diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
index c7a9aee0..bd06e3cb 100644
--- a/emacs/notmuch-mua.el
+++ b/emacs/notmuch-mua.el
@@ -98,11 +98,16 @@ list."
 			      collect header)))
     (message-sort-headers)
     (message-hide-headers)
+    ;; 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)