873,874c873
< (defcustom gnus-buttonized-mime-types (unless (eq mm-verify-option 'never)
< 					'("multipart/signed"))
---
> (defcustom gnus-buttonized-mime-types nil
7714,7729c7713,7734
<   (save-restriction
<     (narrow-to-region (point) (point))
<     (unless (gnus-unbuttonized-mime-type-p (car handle))
<       (gnus-insert-mime-security-button handle))
<     (gnus-mime-display-part (cadr handle))
<     (unless (bolp)
<       (insert "\n"))
<     (unless (gnus-unbuttonized-mime-type-p (car handle))
<       (let ((gnus-mime-security-button-line-format
< 	     gnus-mime-security-button-end-line-format))
< 	(gnus-insert-mime-security-button handle)))
<     (mm-set-handle-multipart-parameter
<      handle 'gnus-region
<      (cons (set-marker (make-marker) (point-min))
< 	   (set-marker (make-marker) (point-max))))))
< 
---
>   (let ((gnus-buttonized-mime-types 
>          ;; when this function is called, the signature has been verified,
>          ;; so we might as well display the button.
>          (if (or (eq mm-verify-option 'always) (eq mm-verify-option 'known))
>              (append '("multipart/signed") gnus-buttonized-mime-types)
>            gnus-buttonized-mime-types)))
>     (save-restriction
>       (narrow-to-region (point) (point))
>       (unless (gnus-unbuttonized-mime-type-p (car handle))
>         (gnus-insert-mime-security-button handle))
>       (gnus-mime-display-part (cadr handle))
>       (unless (bolp)
>         (insert "\n"))
>       (unless (gnus-unbuttonized-mime-type-p (car handle))
>         (let ((gnus-mime-security-button-line-format
>                gnus-mime-security-button-end-line-format))
>           (gnus-insert-mime-security-button handle)))
>       (mm-set-handle-multipart-parameter
>        handle 'gnus-region
>        (cons (set-marker (make-marker) (point-min))
>              (set-marker (make-marker) (point-max)))))))
>