--- folding.orig.el	2009-04-08 15:07:41.000000000 +0100
+++ folding.el	2009-04-08 15:07:51.000000000 +0100
@@ -3220,6 +3220,7 @@
 	    (progn
 	      ;; ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ progn ^^^
 	      ;; turn off folding
+              (remove-hook 'change-major-mode-hook 'folding-mode t)
 	      (if (null (folding-use-overlays-p))
 		  (setq selective-display nil))
 	      (folding-clear-stack)
@@ -3235,6 +3236,7 @@
 			    "%n" item)))
 		     mode-line-format)))
 	  ;; ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ else ^^^
+          (add-hook 'change-major-mode-hook 'folding-mode nil t)
 	  (cond
 	   ((folding-use-overlays-p)
 	    ;;  This may be Emacs specific; how about XEmacs?