--- gnus-art.el~	2016-02-02 02:43:45.605413000 +0000
+++ gnus-art.el	2016-02-03 09:42:20.238190600 +0000
@@ -2722,9 +2722,8 @@
     (when (gmm-called-interactively-p 'any)
       (gnus-treat-article nil))))
 
-(defun article-wash-html ()
+(defun article-wash-html-1 ()
   "Format an HTML article."
-  (interactive)
   (let ((handles nil)
 	(buffer-read-only nil))
     (when (gnus-buffer-live-p gnus-original-article-buffer)
@@ -2735,6 +2734,19 @@
     (mm-enable-multibyte)
     (mm-inline-text-html handles)))
 
+(defun article-wash-html ()
+  "Format an HTML article."
+  (interactive)
+  (cond ((eq mm-text-html-renderer 'shr)
+	 (require 'shr)
+	 (let (shr-inhibit-images shr-blocked-images)
+	   (with-current-buffer gnus-summary-buffer
+	     (setq shr-inhibit-images gnus-inhibit-images
+		   shr-blocked-images (gnus-blocked-images)))
+	   (article-wash-html-1)))
+	(t
+	 (article-wash-html-1))))
+
 (defvar gnus-article-browse-html-temp-list nil
   "List of temporary files created by `gnus-article-browse-html-parts'.
 Internal variable.")
@@ -4930,7 +4942,9 @@
 	      gnus-url-button-commands)))
 
 (defmacro gnus-bind-safe-url-regexp (&rest body)
-  "Bind `mm-w3m-safe-url-regexp' according to `gnus-safe-html-newsgroups'."
+  "Bind `mm-w3m-safe-url-regexp' according to `gnus-safe-html-newsgroups'.
+Also bind `shr-inhibit-images' and `shr-blocked-images' with
+`gnus-inhibit-images' and `gnus-blocked-images' if `shr' is used."
   `(let ((mm-w3m-safe-url-regexp
 	  (let ((group (if (and (derived-mode-p 'gnus-article-mode)
 				(gnus-buffer-live-p
@@ -4948,7 +4962,15 @@
 		       (member group gnus-safe-html-newsgroups)))
 		nil
 	      mm-w3m-safe-url-regexp))))
-     ,@body))
+     (cond ((eq mm-text-html-renderer 'shr)
+	    (require 'shr)
+	    (let (shr-inhibit-images shr-blocked-images)
+	      (with-current-buffer gnus-summary-buffer
+		(setq shr-inhibit-images gnus-inhibit-images
+		      shr-blocked-images (gnus-blocked-images)))
+	      ,@body))
+	   (t
+	    ,@body))))
 
 (defun gnus-mime-button-menu (event prefix)
  "Construct a context-sensitive menu of MIME commands."
--- mm-decode.el~	2016-01-04 22:05:27.255542500 +0000
+++ mm-decode.el	2016-02-03 09:42:20.238799100 +0000
@@ -1844,15 +1844,7 @@
 				  (when handle
 				    (mm-with-part handle
 				      (buffer-string))))))
-	shr-inhibit-images shr-blocked-images charset char)
-    (if (and (boundp 'gnus-summary-buffer)
-	     (bufferp gnus-summary-buffer)
-	     (buffer-name gnus-summary-buffer))
-	(with-current-buffer gnus-summary-buffer
-	  (setq shr-inhibit-images gnus-inhibit-images
-		shr-blocked-images (gnus-blocked-images)))
-      (setq shr-inhibit-images gnus-inhibit-images
-	    shr-blocked-images (gnus-blocked-images)))
+	charset char)
     (unless handle
       (setq handle (mm-dissect-buffer t)))
     (setq charset (mail-content-type-get (mm-handle-type handle) 'charset))