diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 36d17afab2d..492852eef68 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-04  Lute Kamstra  <lute@gnu.org>
+
+	* nnfolder.el (nnfolder-read-folder): Make sure that undo
+	information is never recorded.
+
 2005-06-03  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* gnus-art.el (gnus-emphasis-alist): Disable the strikethru thingy.
diff --git a/lisp/gnus/nnfolder.el b/lisp/gnus/nnfolder.el
index 961f124a614..20cdb3da273 100644
--- a/lisp/gnus/nnfolder.el
+++ b/lisp/gnus/nnfolder.el
@@ -875,6 +875,7 @@ deleted.  Point is left where the deleted region was."
 			 nnfolder-file-coding-system))
 		    (nnheader-find-file-noselect file t)))))
     (mm-enable-multibyte) ;; Use multibyte buffer for future copying.
+    (buffer-disable-undo)
     (if (equal (cadr (assoc group nnfolder-scantime-alist))
 	       (nth 5 (file-attributes file)))
 	;; This looks up-to-date, so we don't do any scanning.
@@ -901,7 +902,6 @@ deleted.  Point is left where the deleted region was."
 	      maxid start end newscantime
 	      novbuf articles newnum
 	      buffer-read-only)
-	  (buffer-disable-undo)
 	  (setq maxid (cdr active))
 
 	  (unless (or gnus-nov-is-evil nnfolder-nov-is-evil