diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index f9cd3914770..884dbe634ee 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -137,12 +137,12 @@ that file, but does not copy any new mail into the file."
 	(progn
 	  ;; Don't be confused by apparent local-variables spec
 	  ;; in the last message in the RMAIL file.
-	  (let ((inhibit-local-variables t))
+	  (let ((enable-local-variables nil))
 	    (find-file file-name))
 	  (if (verify-visited-file-modtime existed)
 	      (progn (rmail-forget-messages)
 		     (rmail-set-message-counters))))
-      (let ((inhibit-local-variables t))
+      (let ((enable-local-variables nil))
 	(find-file file-name)))
     (if (and existed (> (buffer-size) 0))
 	;; Buffer not new and not empty; ensure in proper mode, but that's all.
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 54d04e79506..5f5420a073c 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -123,10 +123,12 @@ so you can edit or delete these lines.")
 	(insert "BCC: " (user-login-name) "\n"))
     (if mail-archive-file-name
 	(insert "FCC: " mail-archive-file-name "\n"))
-    (insert mail-header-separator "\n\n")
+    (insert mail-header-separator "\n")
     ;; Read the .signature file.
-    (if mail-signature-file
-	(insert-file-contents (expand-file-name mail-signature-file)))
+    (and mail-signature-file
+	 (file-exists-p mail-signature-file)
+	 (progn (insert "\n")
+		(insert-file-contents (expand-file-name mail-signature-file))))
     (goto-char (point-max))
     (or (bolp) (newline)))
   (if to (goto-char (point-max)))