Index: lisp/mml2015.el
===================================================================
RCS file: /usr/local/cvsroot/gnus/lisp/mml2015.el,v
retrieving revision 6.34
diff -r6.34 mml2015.el
375c375,380
<       (match-string 1)
---
>       (let ((signer (match-string 1)))
>         (concat
>          (if (re-search-forward "^gpg: WARNING: This key is not certified with a trusted signature!" nil t)
>              ""
>            "Trusted:")
>          signer))
380c385
<     (let (part message signature)
---
>     (let (part message signature gnus-info-set-p)
409a415,417
>                      (mm-set-handle-multipart-parameter
>                       mm-security-handle 'gnus-info "Error.")
>                      (setq gnus-info-is-set-p t)
413a422,424
>                      (mm-set-handle-multipart-parameter
>                       mm-security-handle 'gnus-info "Quit.")
>                      (setq gnus-info-is-set-p t)
415,416c426,428
< 	    (mm-set-handle-multipart-parameter
< 	     mm-security-handle 'gnus-info "Failed")
---
>             (unless gnus-info-is-set-p
>               (mm-set-handle-multipart-parameter
>                mm-security-handle 'gnus-info "Failed"))