--- spam.el	30 Apr 2004 17:55:59 -0000	7.34
+++ spam.el	11 May 2004 06:31:30 -0000
@@ -861,16 +861,20 @@
 
     (unless (and spam-move-spam-nonspam-groups-only
 		 (spam-group-spam-contents-p gnus-newsgroup-name))
-      (gnus-message 6 "Marking spam as expired and moving it to %s"
-		    (gnus-parameter-spam-process-destination 
-		     gnus-newsgroup-name))
-      (spam-mark-spam-as-expired-and-move-routine
-       (gnus-parameter-spam-process-destination gnus-newsgroup-name)))
+      (let ((num
+	     (spam-mark-spam-as-expired-and-move-routine
+	      (gnus-parameter-spam-process-destination gnus-newsgroup-name))))
+	(when (> num 0)
+	  (gnus-message 6 "Marking %d spams as expired and moving it to %s"
+			num (gnus-parameter-spam-process-destination
+			     gnus-newsgroup-name)))))
 
     ;; now we redo spam-mark-spam-as-expired-and-move-routine to only
     ;; expire spam, in case the above did not expire them
-    (gnus-message 6 "Marking spam as expired without moving it")
-    (spam-mark-spam-as-expired-and-move-routine nil)
+    (let ((num (spam-mark-spam-as-expired-and-move-routine nil)))
+      (when (> num 0)
+	(gnus-message 6 "Marking %d spams as expired without moving it"
+		      num)))
 
     (when (or (spam-group-ham-contents-p gnus-newsgroup-name)
 	      (and (spam-group-spam-contents-p gnus-newsgroup-name)
@@ -964,7 +968,8 @@
 	  (let ((gnus-novice-user nil))	; don't ask me if I'm sure
 	    (gnus-summary-delete-article nil))))
 
-      (gnus-summary-yank-process-mark))))
+      (gnus-summary-yank-process-mark)
+      (length tomove))))
 
 (defun spam-ham-copy-or-move-routine (copy groups)
   (gnus-summary-kill-process-mark)
@@ -1406,12 +1411,13 @@
 			    gnus-newsgroup-articles
 			    classification)))
 	;; process them
-	(gnus-message 5 "%s %d %s articles as %s using backend %s"
-		      (if unregister "Unregistering" "Registering")
-		      (length articles)
-		      (if specific-articles "specific" "")
-		      (symbol-name classification)
-		      (symbol-name check))
+	(when articles
+	  (gnus-message 5 "%s %d%s articles as %s using backend %s"
+			(if unregister "Unregistering" "Registering")
+			(length articles)
+			(if specific-articles " specific" "")
+			(symbol-name classification)
+			(symbol-name check)))
 	(funcall run-function articles)
 	;; now log all the registrations (or undo them, depending on unregister)
 	(dolist (article articles)