1 files changed, 3 insertions, 1 deletions

diff --git a/lisp/url/url-mailto.el b/lisp/url/url-mailto.el
index 9f20989a0b1..6585ba8e458 100644
--- a/lisp/url/url-mailto.el
+++ b/lisp/url/url-mailto.el
@@ -100,7 +100,9 @@
     (while args
       (if (string= (caar args) "body")
           (progn
-            (goto-char (point-max))
+            (goto-char (point-min))
+            (or (search-forward (concat "\n" mail-header-separator "\n") nil t)
+                (goto-char (point-max)))
             (insert (mapconcat 
                      #'(lambda (string)
                          (replace-regexp-in-string "\r\n" "\n" string))