--- ../../pgnus-sent/lisp/gnus-art.el	Thu Sep  2 15:23:33 1999
+++ gnus-art.el	Thu Sep  9 16:13:26 1999
@@ -3146,7 +3146,8 @@
 	  (cond
 	   (display
 	    (when move
-	      (forward-line -2))
+	      (forward-line -2)
+	      (setq beg (point)))
 	    (let ((mail-parse-charset gnus-newsgroup-charset)
 		  (mail-parse-ignored-charsets 
 		   (save-excursion (set-buffer gnus-summary-buffer)
@@ -3155,7 +3156,8 @@
 	    (goto-char (point-max)))
 	   ((and text not-attachment)
 	    (when move
-	      (forward-line -2))
+	      (forward-line -2)
+	      (setq beg (point)))
 	    (gnus-article-insert-newline)
 	    (mm-insert-inline handle (mm-get-part handle))
 	    (goto-char (point-max))))
@@ -4081,14 +4083,17 @@
 	  (alist gnus-button-alist)
 	  beg entry regexp)
       ;; Remove all old markers.
-      (let (marker entry)
+      (let (marker entry new-list)
 	(while (setq marker (pop gnus-button-marker-list))
-	  (goto-char marker)
-	  (when (setq entry (gnus-button-entry))
-	    (put-text-property (match-beginning (nth 1 entry))
-			       (match-end (nth 1 entry))
-			       'gnus-callback nil))
-	  (set-marker marker nil)))
+	  (if (or (< marker (point-min)) (>= marker (point-max)))
+	      (push marker new-list)
+	    (goto-char marker)
+	    (when (setq entry (gnus-button-entry))
+	      (put-text-property (match-beginning (nth 1 entry))
+				 (match-end (nth 1 entry))
+				 'gnus-callback nil))
+	    (set-marker marker nil)))
+	(setq gnus-button-marker-list new-list))
       ;; We skip the headers.
       (article-goto-body)
       (setq beg (point))