diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
index 9fbb94a6..bd06e3cb 100644
--- a/emacs/notmuch-mua.el
+++ b/emacs/notmuch-mua.el
@@ -101,7 +101,7 @@ list."
     ;; insert the message body - but put it in front of the signature
     ;; if one is present
     (goto-char (point-max))
-    (if (re-search-backward "-- " nil t)
+    (if (re-search-backward message-signature-separator nil t)
 	  (forward-line -1)
       (goto-char (point-max)))
     (insert body))