diff --git a/org-msg.el b/org-msg.el
index a060768..354f379 100644
--- a/org-msg.el
+++ b/org-msg.el
@@ -1207,7 +1207,7 @@ MML tags."
 		(org-escape-code-in-region (point) (point-max))))
 	    (when .signature
 	      (unless (eq .style 'top-posting)
-		(goto-char (point-max)))
+		(goto-char (org-msg-end)))
 	      (insert .signature)))
 	  (if (org-msg-message-fetch-field "to")
 	      (org-msg-goto-body)