2 files changed, 10 insertions, 4 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 26538731932..b725a688fe6 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-16  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * nnimap.el (nnimap-wait-for-response): Fix the end-point calculation
+        to really consider the last line.
+
 2010-12-16  Daiki Ueno  <ueno@unixuser.org>
 
         * auth-source.el (auth-source-gpg-encrypt-to): New variable to set the
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index d1d6d058421..34e57b6dc19 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -1565,10 +1565,11 @@ textual parts.")
                             (format "^%d .*\n" sequence)
                             (if nnimap-streaming
                                 (max (point-min)
-                                     (- (point) 500)
-                                     (save-excursion
-                                       (forward-line -1)
-                                       (point)))
+                                     (min
+                                      (- (point) 500)
+                                      (save-excursion
+                                        (forward-line -1)
+                                        (point))))
                               (point-min))
                             t)))
             (when messagep