2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 3c9c96051e3..534ac3af69d 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-27  enami tsugutomo  <tsugutomo.enami@jp.sony.com>
+
+        * nnimap.el (nnimap-wait-for-response): Ignore NOOP response requested
+        to keep connection open (bug#18728).
+
 2014-10-20  Glenn Morris  <rgm@gnu.org>
 
         * Version 24.4 released.
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index 2fc2dd6af79..6a6ad4fbe76 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -1872,7 +1872,7 @@ Return the server's response to the SELECT or EXAMINE command."
                         (while (and (not (bobp))
                                     (progn
                                       (forward-line -1)
-                                      (looking-at "\\*"))))
+                                      (looking-at "\\*\\|[0-9]+ OK NOOP"))))
                         (not (looking-at (format "%d .*\n" sequence)))))
             (when messagep
               (nnheader-message-maybe