2 files changed, 13 insertions, 3 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 9556827554b..5867a5c0bc9 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,9 @@
 2010-10-08  Katsumi Yamaoka  <yamaoka@jpl.org>
 
+        * gnus-gravatar.el (gnus-treat-from-gravatar)
+        (gnus-treat-mail-gravatar): Bind gnus-gravatar-too-ugly to nil when
+        called interactively.
+
         * gnus-art.el (gnus-mime-view-part-externally)
         (gnus-mime-view-part-internally): Make predicate function passed to
         gnus-mime-view-part-as-type assume argument is a mime type, not a list
diff --git a/lisp/gnus/gnus-gravatar.el b/lisp/gnus/gnus-gravatar.el
index e974e9a8a89..97f4ba7359b 100644
--- a/lisp/gnus/gnus-gravatar.el
+++ b/lisp/gnus/gnus-gravatar.el
@@ -113,7 +113,10 @@ If gravatar is already displayed, remove it."
   (gnus-with-article-buffer
     (if (memq 'from-gravatar gnus-article-wash-types)
         (gnus-delete-images 'from-gravatar)
-      (gnus-gravatar-transform-address "from" 'from-gravatar))))
+      (let ((gnus-gravatar-too-ugly
+             (unless buffer-read-only ;; When type `W D g'
+               gnus-gravatar-too-ugly)))
+        (gnus-gravatar-transform-address "from" 'from-gravatar)))))
 
 ;;;###autoload
 (defun gnus-treat-mail-gravatar ()
@@ -123,8 +126,11 @@ If gravatars are already displayed, remove them."
     (gnus-with-article-buffer
       (if (memq 'mail-gravatar gnus-article-wash-types)
           (gnus-delete-images 'mail-gravatar)
-        (gnus-gravatar-transform-address "cc" 'mail-gravatar)
-        (gnus-gravatar-transform-address "to" 'mail-gravatar))))
+        (let ((gnus-gravatar-too-ugly
+               (unless buffer-read-only ;; When type `W D h'
+                 gnus-gravatar-too-ugly)))
+          (gnus-gravatar-transform-address "cc" 'mail-gravatar)
+          (gnus-gravatar-transform-address "to" 'mail-gravatar)))))
 
 (provide 'gnus-gravatar)