--- message-utils.orig.el	Fri Jun  7 15:47:29 2002
+++ message-utils.el	Fri Jun  7 17:02:01 2002
@@ -128,6 +128,12 @@
   :group 'message-various
   :type 'regexp)
 
+(defcustom message-strip-subject-was-confirm nil
+  "When non-nil `message-strip-subject-was' will ask for a confirmation
+before stripping `message-subject-was-regexp' from subject."
+  :type 'boolean
+  :group 'message-various)
+
 ;;;###autoload
 (defun message-strip-subject-was ()
   "Remove trailing \"(Was: <old subject>)\" from subject lines."
@@ -137,11 +143,14 @@
     (cond (subject
 	   (setq pos (or (string-match message-subject-was-regexp subject) 0))
 	   (cond ((> pos 0)
-		  (message-goto-subject)
-		  (message-delete-line)
-		  (insert (concat "Subject: "
-				  (substring subject 0 pos) "\n")))))))
-    (widen))
+		  (when (or (null message-strip-subject-was-confirm)
+			    (yes-or-no-p
+			     "Strip `(was: <old subject>)' in subject? "))
+		    (message-goto-subject)
+		    (message-delete-line)
+		    (insert (concat "Subject: "
+				    (substring subject 0 pos) "\n"))))))))
+  (widen))
 
 ;;; Suggested by Jonas Steverud  @  www.dtek.chalmers.se/~d4jonas/
 ;;;###autoload