4 files changed, 4 insertions, 3 deletions

diff --git a/lisp/mail/mspools.el b/lisp/mail/mspools.el
index 8dc165dcc5e..fc60a3a56eb 100644
--- a/lisp/mail/mspools.el
+++ b/lisp/mail/mspools.el
@@ -357,7 +357,7 @@ nil."
   (use-local-map mspools-mode-map)
   (setq major-mode 'mspools-mode)
   (setq mode-name "MSpools")
-  )
+  (run-mode-hooks 'mspools-mode-hook))
 
 (defun mspools-get-spool-files ()
   "Find the list of spool files and display them in *spools* buffer."
diff --git a/lisp/mail/rmailedit.el b/lisp/mail/rmailedit.el
index ceea389cea1..2fbc9290635 100644
--- a/lisp/mail/rmailedit.el
+++ b/lisp/mail/rmailedit.el
@@ -57,7 +57,7 @@ to return to regular RMAIL:
   *  \\[rmail-cease-edit] makes them permanent.
 This functions runs the normal hook `rmail-edit-mode-hook'.
 \\{rmail-edit-map}"
-  (text-mode)
+  (delay-mode-hooks (text-mode))
   (use-local-map rmail-edit-map)
   (setq major-mode 'rmail-edit-mode)
   (setq mode-name "RMAIL Edit")
diff --git a/lisp/mail/supercite.el b/lisp/mail/supercite.el
index ba4aca881ef..593f46cad40 100644
--- a/lisp/mail/supercite.el
+++ b/lisp/mail/supercite.el
@@ -720,6 +720,7 @@ the list should be unique."
     (sc-mail-warn-if-non-rfc822-p (sc-mail-error-in-mail-field))
     (end                          (setq sc-mail-headers-end (point))))
   "Regi frame for glomming mail header information.")
+(put 'sc-mail-glom-frame 'risky-local-variable t)
 
 (defvar curline)                        ; dynamic bondage
 
diff --git a/lisp/mail/undigest.el b/lisp/mail/undigest.el
index 2c447065643..f8856243194 100644
--- a/lisp/mail/undigest.el
+++ b/lisp/mail/undigest.el
@@ -40,7 +40,7 @@
   "^----.*\\([Ff]orwarded\\|[Oo]riginal\\).*[Mm]essage"
   "*Regexp to match the string that introduces forwarded messages.
 This is not a header, but a string contained in the body of the message.
-You may need to customise it for local needs."
+You may need to customize it for local needs."
   :type 'regexp
   :group 'rmail-headers)