* mail/rmailedit.el (rmail-edit-current-message):

Call rmail-modify-format here.
(rmail-cease-edit): Not here.

2 files changed, 7 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e0b1739c562..fcb89a96436 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2009-05-17  Richard M Stallman  <rms@gnu.org>
+
+        * mail/rmailedit.el (rmail-edit-current-message):
+        Call rmail-modify-format here.
+        (rmail-cease-edit): Not here.
+
 2009-05-17  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * vc-bzr.el (vc-bzr-state-heuristic): Fallback on vc-bzr-state in case
diff --git a/lisp/mail/rmailedit.el b/lisp/mail/rmailedit.el
index a4f89b119a1..f63e6870a8f 100644
--- a/lisp/mail/rmailedit.el
+++ b/lisp/mail/rmailedit.el
@@ -88,6 +88,7 @@ This function runs the hooks `text-mode-hook' and `rmail-edit-mode-hook'.
   (interactive)
   (if (zerop rmail-total-messages)
       (error "No messages in this buffer"))
+  (rmail-modify-format)
   (make-local-variable 'rmail-old-pruned)
   (setq rmail-old-pruned (rmail-msg-is-pruned))
   (rmail-edit-mode)
@@ -117,7 +118,6 @@ This function runs the hooks `text-mode-hook' and `rmail-edit-mode-hook'.
 (defun rmail-cease-edit ()
   "Finish editing message; switch back to Rmail proper."
   (interactive)
-  (rmail-modify-format)
   (if (rmail-summary-exists)
       (with-current-buffer rmail-summary-buffer
         (rmail-summary-enable)))