--- a/lisp/vm/vm-reply.el	Mon Aug 13 09:31:48 2007 +0200
+++ b/lisp/vm/vm-reply.el	Mon Aug 13 09:32:43 2007 +0200
@@ -438,19 +438,19 @@
       (let ((this-command this-command))
 	(save-excursion
 	  (mail-send))))
+    ;; be careful, something could have killed the composition
+    ;; buffer inside mail-send.
+    (if (eq (current-buffer) composition-buffer)
+	(progn
+	  (vm-rename-current-mail-buffer)
+	  (vm-keep-mail-buffer (current-buffer))))
     (cond ((eq vm-system-state 'replying)
 	   (vm-mail-mark-replied))
 	  ((eq vm-system-state 'forwarding)
 	   (vm-mail-mark-forwarded))
 	  ((eq vm-system-state 'redistributing)
 	   (vm-mail-mark-redistributed)))
-    (vm-display nil nil '(vm-mail-send) '(vm-mail-send))
-    ;; be careful, something could have killed the composition
-    ;; buffer inside mail-send.
-    (if (eq (current-buffer) composition-buffer)
-	(progn
-	  (vm-rename-current-mail-buffer)
-	  (vm-keep-mail-buffer (current-buffer))))))
+    (vm-display nil nil '(vm-mail-send) '(vm-mail-send))))
 
 (defun vm-mail-mode-get-header-contents (header-name-regexp)
   (let ((contents nil)