diff --git a/mu4e/mu4e-draft.el b/mu4e/mu4e-draft.el
index 896db7a5..4163f895 100644
--- a/mu4e/mu4e-draft.el
+++ b/mu4e/mu4e-draft.el
@@ -85,7 +85,8 @@ all its settings apply."
       (push-mark (point-max))
       ;; set the the signature separator to 'loose', since in the real world,
       ;; many message don't follow the standard...
-      (let ((message-signature-separator "^-- *$"))
+      (let ((message-signature-separator "^-- *$")
+	     (message-signature-insert-empty-line t))
 	(funcall mu4e-compose-cite-function))
       (pop-mark)
       (goto-char (point-min))
@@ -420,7 +421,8 @@ from either `mu4e~draft-reply-construct', or
 	    (t (mu4e-error "unsupported compose-type %S" compose-type))))
 	;; include the message signature (if it's set)
 	(when mu4e-compose-signature-auto-include
-	  (let ((message-signature mu4e-compose-signature))
+	  (let ((message-signature mu4e-compose-signature)
+		 (message-signature-insert-empty-line t))
 	    (message-insert-signature)
 	    (mu4e~fontify-signature)))))
 	  ;; evaluate mu4e~drafts-drafts-folder once, here, and use that value