2 files changed, 5 insertions, 1 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index e933a80199d..3038ef53ef4 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * pop3.el (pop3-open-server): Error messages are "-ERR".
+
 2011-05-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * pop3.el (pop3-open-server): Upgrade opportunistically to STARTTLS.
diff --git a/lisp/gnus/pop3.el b/lisp/gnus/pop3.el
index 3ca5cab76e1..96b2ae17a5a 100644
--- a/lisp/gnus/pop3.el
+++ b/lisp/gnus/pop3.el
@@ -306,7 +306,7 @@ Returns the process associated with the connection."
                     (t
                      (or pop3-stream-type 'network)))
              :capability-command "CAPA\r\n"
-             :end-of-command "^\\.\r?\n\\|^\\+[A-Z]+ .*\n"
+             :end-of-command "^\\.\r?\n\\|^\\(-ERR\\|+OK \\).*\n"
              :success "^\\+OK.*\n"
              :return-list t
              :starttls-function