--- a/lisp/gnus/nnfolder.el	Mon Aug 13 09:21:56 2007 +0200
+++ b/lisp/gnus/nnfolder.el	Mon Aug 13 09:23:06 2007 +0200
@@ -225,7 +225,7 @@
        (let ((bufs nnfolder-buffer-alist))
 	 (save-excursion
 	   (while bufs
-	     (if (not (buffer-live-p (nth 1 (car bufs))))
+	     (if (not (gnus-buffer-live-p (nth 1 (car bufs))))
 		 (setq nnfolder-buffer-alist
 		       (delq (car bufs) nnfolder-buffer-alist))
 	       (set-buffer (nth 1 (car bufs)))
@@ -377,12 +377,14 @@
 	 (delete-region (point) (progn (forward-line 1) (point))))
        (when nnmail-cache-accepted-message-ids
 	 (nnmail-cache-insert (nnmail-fetch-field "message-id")))
-       (setq result
-	     (car (nnfolder-save-mail
-		   (if (stringp group)
-		       (list (cons group (nnfolder-active-number group)))
-		     (setq art-group
-			   (nnmail-article-group 'nnfolder-active-number)))))))
+       (setq result (if (stringp group)
+			(list (cons group (nnfolder-active-number group)))
+		      (setq art-group
+			    (nnmail-article-group 'nnfolder-active-number))))
+       (if (null result)
+	   (setq result 'junk)
+	 (setq result
+	       (car (nnfolder-save-mail result)))))
      (when last
        (save-excursion
 	 (nnfolder-possibly-change-folder (or (caar art-group) group))
@@ -682,6 +684,8 @@
 			 (< maxid 2)))
 	    (goto-char (point-max))
 	    (unless (re-search-backward marker nil t)
+	      (goto-char (point-min)))
+	    (when (nnmail-search-unix-mail-delim)
 	      (goto-char (point-min))))
 
 	  ;; Keep track of the active number on our own, and insert it back