* nnimap.el (nnimap-retrieve-headers): Remove CRLF from the headers.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f2a7ddc..20d1d56 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-12-17  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * nnimap.el (nnimap-retrieve-headers): Remove CRLF from the headers.
+
 2010-12-17  Julien Danjou  <julien@danjou.info>
 
        * gnus-util.el (gnus-rescale-image): Allow to resize images even if

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 34e57b6..acbb091 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -167,7 +167,8 @@ textual parts.")
          (nnimap-article-ranges (gnus-compress-sequence articles))
          (nnimap-header-parameters))
         t)
-       (nnimap-transform-headers))
+       (nnimap-transform-headers)
+       (nnheader-remove-cr-followed-by-lf))
       (insert-buffer-substring
        (nnimap-find-process-buffer (current-buffer))))
     'headers))
@@ -1568,7 +1569,7 @@ textual parts.")
                                     (min
                                      (- (point) 500)
                                      (save-excursion
-                                       (forward-line -1)
+                                       (forward-line -3)
                                        (point))))
                              (point-min))
                            t)))