X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fnnimap.el;h=1899b0ef030e2b7c4214a160b7c605bf39cb7b65;hb=91b06d4b174a8a2e578595e95314234e03bdc9f4;hp=34e57b6dc19b6c1be69460e3a84681fda13a81c6;hpb=bcd7d0337d56572322144d76c1d715114115bd19;p=gnus

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 34e57b6dc..1899b0ef0 100644
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -1,6 +1,6 @@
 ;;; nnimap.el --- IMAP interface for Gnus
 
-;; Copyright (C) 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2010, 2011 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;         Simon Josefsson <simon@josefsson.org>
@@ -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))
@@ -638,7 +639,7 @@ textual parts.")
   (let ((result (nnimap-possibly-change-group
 		 ;; Don't SELECT the group if we're going to select it
 		 ;; later, anyway.
-		 (if (and dont-check
+		 (if (and (not dont-check)
 			  (assoc group nnimap-current-infos))
 		     nil
 		   group)
@@ -1568,7 +1569,7 @@ textual parts.")
 				     (min
 				      (- (point) 500)
 				      (save-excursion
-					(forward-line -1)
+					(forward-line -3)
 					(point))))
 			      (point-min))
 			    t)))