2 files changed, 5 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 0d9486e0..0344249a 100644
--- a/NEWS
+++ b/NEWS
@@ -48,6 +48,9 @@ fetchmail 6.3.8 (not yet released):
 * Fix pluralization of oversized-message warning mails.
 * Fix manual page: --sslcheck -> --sslcertck, and do not set trailing 
   "recommended:" in bold. Debian Bug #413059, reported by Rafal Czlonka.
+* Repoll immediately if a protocol error happens during the authentication 
+  attempt after a failed opportunistic TLS upgrade. Gentoo Bug #163782 comment 
+  #9, reported by Takuto Matsuu.
 
 # KNOWN BUGS AND WORKAROUNDS:
   (this section floats upwards through the NEWS file so it stays with the
diff --git a/pop3.c b/pop3.c
index 556053ee..3ba6af36 100644
--- a/pop3.c
+++ b/pop3.c
@@ -686,7 +686,8 @@ static int pop3_getauth(int sock, struct query *ctl, char *greeting)
 #ifdef SSL_ENABLE
     /* this is for servers which claim to support TLS, but actually
      * don't! */
-    if (connection_may_have_tls_errors && ok == PS_SOCKET)
+    if (connection_may_have_tls_errors
+		    && (ok == PS_SOCKET || ok == PS_PROTOCOL))
     {
 	xfree(ctl->sslproto);
 	ctl->sslproto = xstrdup("");