2 files changed, 11 insertions, 1 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 6b21888c27e..396ad2fd2a6 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
+2015-02-10  Lars Ingebrigtsen  <larsi@gnus.org>
+
+        * mm-decode.el (mm-shr): Only pass the fill column when not using
+        fonts, because limiting the width to what's appropriate for followups
+        doesn't really help when not using proportional fonts.
+
 2015-02-09  Lars Ingebrigtsen  <larsi@gnus.org>
 
         * mm-decode.el (mm-convert-shr-links): Don't overwrite the faces from
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index 463d125a2b2..5a8375cf4e6 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -1815,6 +1815,7 @@ If RECURSIVE, search recursively."
                   (start end &optional base-url))
 (declare-function shr-insert-document "shr" (dom))
 (defvar shr-blocked-images)
+(defvar shr-use-fonts)
 (defvar gnus-inhibit-images)
 (autoload 'gnus-blocked-images "gnus-art")
 
@@ -1822,7 +1823,10 @@ If RECURSIVE, search recursively."
   ;; Require since we bind its variables.
   (require 'shr)
   (let ((article-buffer (current-buffer))
-        (shr-width (if shr-use-fonts nil fill-column))
+        (shr-width (if (and (boundp 'shr-use-fonts)
+                            shr-use-fonts)
+                       nil
+                     fill-column))
         (shr-content-function (lambda (id)
                                 (let ((handle (mm-get-content-id id)))
                                   (when handle