1 files changed, 2 insertions, 1 deletions

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 9ab9c86f11f..096723725d6 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -1829,7 +1829,8 @@ see the documentation of `rmail-resend'."
                                (current-buffer)
                                rmail-current-message)))
           (save-excursion
-            (goto-char (point-max))
+            ;; Insert after header separator--before signature if any.
+            (search-forward-regexp (concat "^" mail-header-separator))
             (forward-line 1)
             (insert-buffer forward-buffer))))))