Snapshot 6.3.6-rc1.

svn path=/branches/BRANCH_6-3/; revision=4925

16 files changed, 429 insertions, 338 deletions

diff --git a/NEWS b/NEWS
index 15202950..489ff523 100644
--- a/NEWS
+++ b/NEWS
@@ -57,6 +57,11 @@ fetchmail 6.3.6 (not yet released):
 * some of the logging output is not very helpful
 * some of the documentation is still not up to date
 
+# IMPORTANT CHANGE:
+* sslproto 'tls1' enforces STARTTLS for POP3/IMAP and terminates the connection
+  if unsuccessful. The same configuration causes connection failure with POP2.
+  Reported by Isaac Wilcox.
+
 # BUG FIXES:
 * Repair --logfile, broken in 6.3.5. BerliOS Bug #9059,
   reported by Brian Harring.
diff --git a/configure.ac b/configure.ac
index 44aea1e0..885121c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl
 
-AC_INIT([fetchmail],[6.3.5],[fetchmail-users@lists.berlios.de])
+AC_INIT([fetchmail],[6.3.6-rc1],[fetchmail-users@lists.berlios.de])
 AC_CONFIG_SRCDIR([fetchmail.h])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_LIBOBJ_DIR([.])
diff --git a/fetchmail.man b/fetchmail.man
index 52ce5fe0..9f267f57 100644
--- a/fetchmail.man
+++ b/fetchmail.man
@@ -354,7 +354,8 @@ from. The folder information is written only since version 6.3.4.
 (Keyword: ssl)
 Causes the connection to the mail server to be encrypted via SSL.  Connect
 to the server using the specified base protocol over a connection secured
-by SSL.  SSL support must be present at the server.
+by SSL. This option defeats TLS negotiation. Use \-\-sslcertck to
+validate the certificates presented by the server.
 .sp
 Note that fetchmail may still try to negotiate TLS even if this option
 is not given. You can use the \-\-sslproto option to defeat this
@@ -408,12 +409,13 @@ server.  This can cause some complications in daemon mode.
 (Keyword: sslproto)
 Forces an SSL or TLS protocol. Possible values are '\fBSSL2\fR',
 \&'\fBSSL3\fR', '\fBSSL23\fR', and '\fBTLS1\fR'. Try this if the default
-handshake does not work for your server. To defeat automatic TLSv1
-negotiation when the server advertises STARTTLS or STLS, use \fB''\fR or
-\&'\fBSSL23\fR'. This option, even if the argument is the empty string,
-will also suppress the diagnostic 'SERVER: opportunistic upgrade to
-TLS.' message in verbose mode. The default is to try appropriate
-protocols depending on context.
+handshake does not work for your server. Use this option with
+'\fBTLS1\fR' to enforce a TLS connection. To defeat opportunistic TLSv1
+negotiation when the server advertises STARTTLS or STLS, use \fB''\fR.
+This option, even if the argument is the empty string, will also
+suppress the diagnostic 'SERVER: opportunistic upgrade to TLS.' message
+in verbose mode. The default is to try appropriate protocols depending
+on context.
 .TP
 .B \-\-sslcertck
 (Keyword: sslcertck)
@@ -421,10 +423,11 @@ Causes fetchmail to strictly check the server certificate against a set of
 local trusted certificates (see the \fBsslcertpath\fR option). If the server
 certificate is not signed by one of the trusted ones (directly or indirectly),
 the SSL connection will fail, regardless of the \fBsslfingerprint\fR
-option. This checking should prevent man-in-the-middle attacks against
-the SSL connection. Note that CRLs are seemingly not currently supported
-by OpenSSL in certificate verification! Your system clock should be
-reasonably accurate when using this option.
+option. This checking is required, but not sufficient, to prevent
+man-in-the-middle attacks against the SSL connection. Use \-\-ssl or
+\-\-sslproto to enforce SSL or TLS. Note that CRLs are seemingly not
+currently supported by OpenSSL in certificate verification! Your system
+clock should be reasonably accurate when using this option.
 .IP
 Note that this optional behavior may become default behavior in future
 fetchmail versions.
@@ -1043,20 +1046,33 @@ username and the part to the right as the NTLM domain.
 .PP
 You can access SSL encrypted services by specifying the \-\-ssl option.
 You can also do this using the "ssl" user option in the .fetchmailrc
-file.  With SSL encryption enabled, queries are initiated over a connection
-after negotiating an SSL session.  Some services, such as POP3 and IMAP,
-have different well known ports defined for the SSL encrypted services.
-The encrypted ports will be selected automatically when SSL is enabled and
-no explicit port is specified.
-.PP
-When connecting to an SSL encrypted server, the server presents a certificate
+file. With SSL encryption enabled, queries are initiated over a connection
+after negotiating an SSL session, and the connection fails if SSL cannot
+be negotiated.  Some services, such as POP3 and IMAP, have different
+well known ports defined for the SSL encrypted services.  The encrypted
+ports will be selected automatically when SSL is enabled and no explicit
+port is specified. The \-\-sslproto option can be used to select the SSL
+protocols (default: v2 or v3).  The \-\-sslcertck command line or
+sslcertck run control file option should be used to force strict
+certificate checking - see below.
+.PP
+If SSL is not configured, fetchmail may opportunistically try to use
+TLS. It can be forced to use TLS by using \-\-sslproto "TLS1". TLS
+connections use the same port as the unencrypted version of the
+protocol. The \-\-sslcertck command line or sslcertck run control file
+option should be used to force strict certificate checking - see below.
+.PP
+When connecting to an SSL or TLS encrypted server, the server presents a certificate
 to the client for validation.  The certificate is checked to verify that
 the common name in the certificate matches the name of the server being
 contacted and that the effective and expiration dates in the certificate
 indicate that it is currently valid.  If any of these checks fail, a warning
 message is printed, but the connection continues.  The server certificate
 does not need to be signed by any specific Certifying Authority and may
-be a "self-signed" certificate.
+be a "self-signed" certificate. If the \-\-sslcertck command line option
+or sslcertck run control file option is used, fetchmail will instead
+abort if any of these checks fail. Use of the sslcertck or \-\-sslcertck
+option is advised.
 .PP
 Some SSL encrypted servers may request a client side certificate.  A client
 side public SSL certificate and private SSL key may be specified.  If
@@ -1074,9 +1090,10 @@ can protect you from a passive eavesdropper it doesn't help against an
 active attacker. It's clearly an improvement over sending the
 passwords in clear but you should be aware that a man-in-the-middle
 attack is trivially possible (in particular with tools such as dsniff,
-http://monkey.org/~dugsong/dsniff/).  Use of an ssh tunnel (see
-below for some examples) is preferable if you care seriously about the
-security of your mailbox.
+http://monkey.org/~dugsong/dsniff/).  Use of strict certificate checking
+with a certification authority recognized by server and client, or
+perhaps of an ssh tunnel (see below for some examples) is preferable if
+you care seriously about the security of your mailbox and passwords.
 .SS ESMTP AUTH
 .PP
 .B fetchmail
diff --git a/imap.c b/imap.c
index d397542f..5c1d8236 100644
--- a/imap.c
+++ b/imap.c
@@ -371,6 +371,7 @@ static int imap_getauth(int sock, struct query *ctl, char *greeting)
     int ok = 0;
 #ifdef SSL_ENABLE
     flag did_stls = FALSE;
+    flag using_tls = FALSE;
 #endif /* SSL_ENABLE */
 
     (void)greeting;
@@ -416,13 +417,14 @@ static int imap_getauth(int sock, struct query *ctl, char *greeting)
 	       if (!ctl->sslproto && !ctl->wehaveauthed)
 	       {
 		   ctl->sslproto = xstrdup("");
-		   /* repoll immediately */
+		   /* repoll immediately with TLS disabled */
 		   return(PS_REPOLL);
 	       }
                report(stderr,
-                      GT_("SSL connection failed.\n"));
+                      GT_("TLS connection failed.\n"));
                return PS_SOCKET;
            } else {
+	       using_tls = TRUE;
 	       if (outlevel >= O_VERBOSE && !ctl->sslproto)
 		   report(stdout, GT_("%s: opportunistic upgrade to TLS.\n"), realhost);
 	   }
@@ -440,6 +442,11 @@ static int imap_getauth(int sock, struct query *ctl, char *greeting)
 	    */
 	   capa_probe(sock, ctl);
     }
+    /* Check if TLS was enforced. */
+    if ((ctl->sslproto && !strcasecmp(ctl->sslproto,"tls1")) && !ctl->use_ssl && !using_tls) {
+	report(stderr, GT_("TLS connection failed.\n"));
+	return PS_SOCKET;
+    }
 #endif /* SSL_ENABLE */
 
     /*
diff --git a/po/ca.po b/po/ca.po
index bfe54fe5..6edcf4b1 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.5-b1\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2006-09-27 00:05+0200\n"
+"POT-Creation-Date: 2006-11-01 23:48+0100\n"
 "PO-Revision-Date: 2006-08-31 19:22+0200\n"
 "Last-Translator: Ernest Adrogu� Calveras <eadrogue@gmx.net>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -249,7 +249,7 @@ msgstr "Subject: fetchmail: Servidor inaccessible."
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "El fetchmail no ha pogut contactar amb el servidor %s:"
 
-#: driver.c:1096 imap.c:423 pop3.c:465
+#: driver.c:1096
 msgid "SSL connection failed.\n"
 msgstr "La conexi� SSL ha fallat.\n"
 
@@ -1682,76 +1682,81 @@ msgstr "S'ha identificat el protocol com a IMAP2 o IMAP2BIS\n"
 msgid "will idle after poll\n"
 msgstr "es far� una pausa despr�s de l'obtenci�\n"
 
-#: imap.c:427 pop3.c:469
+#: imap.c:424 imap.c:447 pop3.c:466 pop3.c:489
+#, fuzzy
+msgid "TLS connection failed.\n"
+msgstr "La conexi� SSL ha fallat.\n"
+
+#: imap.c:429 pop3.c:470
 #, c-format
 msgid "%s: opportunistic upgrade to TLS.\n"
 msgstr "%s: actualitzaci� oportunista a TLS.\n"
 
-#: imap.c:540
+#: imap.c:547
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Es requereix capacitat per OTP no compilada en el fetchmail\n"
 
-#: imap.c:562 pop3.c:372
+#: imap.c:569 pop3.c:373
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Es requereix capacitat per NTLM no compilada en el fetchmail\n"
 
-#: imap.c:571
+#: imap.c:578
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "El servidor no suporta la capacitat per LOGIN requerida\n"
 
-#: imap.c:645
+#: imap.c:652
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr "recompte de missatges eliminats incorrecte (%d real != %d esperat)\n"
 
-#: imap.c:749 imap.c:808
+#: imap.c:756 imap.c:815
 msgid "re-poll failed\n"
 msgstr "la re-obtenci� ha fallat\n"
 
-#: imap.c:757 imap.c:813
+#: imap.c:764 imap.c:820
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "hi ha %d missatge esperant despr�s de la re-obtenci�\n"
 msgstr[1] "hi ha %d missatges esperant despr�s de la re-obtenci�\n"
 
-#: imap.c:774
+#: imap.c:781
 msgid "mailbox selection failed\n"
 msgstr "ha fallat la selecci� de b�stia\n"
 
-#: imap.c:778
+#: imap.c:785
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "hi ha %d missatge esperant despr�s de la primera obtenci�\n"
 msgstr[1] "hi ha %d missatges esperant despr�s de la primera obtenci�\n"
 
-#: imap.c:792
+#: imap.c:799
 msgid "expunge failed\n"
 msgstr "la supressi� de missatges ha fallat\n"
 
-#: imap.c:796
+#: imap.c:803
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "hi ha %d missatge esperant despr�s de la supressi�\n"
 msgstr[1] "hi ha %d missatges esperant despr�s de la supressi�\n"
 
-#: imap.c:838
+#: imap.c:845
 msgid "search for unseen messages failed\n"
 msgstr "la recerca de missatges no llegits ha fallat\n"
 
-#: imap.c:866
+#: imap.c:873
 #, c-format
 msgid "%lu is unseen\n"
 msgstr "%lu �s no llegit\n"
 
-#: imap.c:878 pop3.c:788
+#: imap.c:885 pop3.c:796
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u �s el primer missatge no llegit\n"
 
-#: imap.c:969
+#: imap.c:976
 msgid ""
 "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr ""
@@ -1952,7 +1957,7 @@ msgstr "recv fatal del servidor\n"
 msgid "Could not decode OTP challenge\n"
 msgstr "No s'ha pogut desxifrar la codificaci� OTP\n"
 
-#: opie.c:64 pop3.c:552
+#: opie.c:64 pop3.c:560
 msgid "Secret pass phrase: "
 msgstr "Contrasenya secreta: "
 
@@ -2267,7 +2272,7 @@ msgstr ""
 "      --showdots    mostra punts de progressi� �dhuc als fitxers de "
 "registre\n"
 
-#: pop3.c:342
+#: pop3.c:343
 msgid ""
 "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
 "of TOP.\n"
@@ -2276,54 +2281,54 @@ msgstr ""
 "lloc de TOP.\n"
 
 # timestamp: marca hor�ria
-#: pop3.c:590
+#: pop3.c:598
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "No s'ha trobat la marca hor�ria APOP requerida a la salutaci�\n"
 
-#: pop3.c:599
+#: pop3.c:607
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Error de sintaxi en la marca hor�ria de la salutaci�\n"
 
-#: pop3.c:621
+#: pop3.c:629
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Petici� de protocol indefinida a POP3_auth\n"
 
-#: pop3.c:629
+#: pop3.c:637
 msgid "lock busy!  Is another session active?\n"
 msgstr "bloqueig temporal! Hi ha alguna altra sessi� activa?\n"
 
-#: pop3.c:708
+#: pop3.c:716
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "No s'ha pogut administrar la resposta UIDL del servidor remot.\n"
 
-#: pop3.c:731
+#: pop3.c:739
 msgid "Server responded with UID for wrong message.\n"
 msgstr "El servidor ha respost amb un UID pel missatge equivocat.\n"
 
-#: pop3.c:758 pop3.c:1004
+#: pop3.c:766 pop3.c:1012
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (n�m=%d) s'ha esborrat, per� encara est� present!\n"
 
-#: pop3.c:767 pop3.c:779 pop3.c:1013 pop3.c:1020
+#: pop3.c:775 pop3.c:787 pop3.c:1021 pop3.c:1028
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u �s no llegit\n"
 
-#: pop3.c:864
+#: pop3.c:872
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr ""
 "Els missatges estan inserits a la llista del servidor. No es pot continuar.\n"
 
-#: pop3.c:956
+#: pop3.c:964
 msgid "protocol error\n"
 msgstr "error de protocol\n"
 
-#: pop3.c:972
+#: pop3.c:980
 msgid "protocol error while fetching UIDLs\n"
 msgstr "error de protocol quan es rebien els UIDLs\n"
 
-#: pop3.c:1342
+#: pop3.c:1350
 msgid "Option --folder is not supported with POP3\n"
 msgstr "L'opci� --folder no est� suportada per POP3\n"
 
diff --git a/po/cs.po b/po/cs.po
index fab36277..9b23a143 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail-6.2.6.alpha1\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2006-09-27 00:05+0200\n"
+"POT-Creation-Date: 2006-11-01 23:48+0100\n"
 "PO-Revision-Date: 2005-07-03 03:57+0200\n"
 "Last-Translator: Miloslav Trmac <mitr@volny.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -242,7 +242,7 @@ msgstr "Subject: Varování fetchmailu o nedostupnosti serveru."
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail nemohl kontaktovat poštovní server %s:"
 
-#: driver.c:1096 imap.c:423 pop3.c:465
+#: driver.c:1096
 msgid "SSL connection failed.\n"
 msgstr "Spojení SSL selhalo.\n"
 
@@ -1655,35 +1655,40 @@ msgstr "Protokol rozpoznán jako IMAP2 nebo IMAP2BIS\n"
 msgid "will idle after poll\n"
 msgstr "po stahování budu nečinný\n"
 
-#: imap.c:427 pop3.c:469
+#: imap.c:424 imap.c:447 pop3.c:466 pop3.c:489
+#, fuzzy
+msgid "TLS connection failed.\n"
+msgstr "Spojení SSL selhalo.\n"
+
+#: imap.c:429 pop3.c:470
 #, c-format
 msgid "%s: opportunistic upgrade to TLS.\n"
 msgstr ""
 
-#: imap.c:540
+#: imap.c:547
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Fetchmail byl přeložen bez podpory pro požadovanou schopnost OTP\n"
 
-#: imap.c:562 pop3.c:372
+#: imap.c:569 pop3.c:373
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Fetchmail byl přeložen bez podpory pro požadovanou schopnost NTLM\n"
 
-#: imap.c:571
+#: imap.c:578
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Server nepodporuje požadovanou schopnost LOGIN\n"
 
-#: imap.c:645
+#: imap.c:652
 #, fuzzy, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr ""
 "zpráva %s@%s:%d nemá očekávanou velikost (%d ve skutečnosti != %d "
 "očekáváno)\n"
 
-#: imap.c:749 imap.c:808
+#: imap.c:756 imap.c:815
 msgid "re-poll failed\n"
 msgstr "opakované stahování selhalo\n"
 
-#: imap.c:757 imap.c:813
+#: imap.c:764 imap.c:820
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
@@ -1691,12 +1696,12 @@ msgstr[0] "%d zpráva čeká po opětovném stahování\n"
 msgstr[1] "%d zprávy čekají po opětovném stahování\n"
 msgstr[2] "%d zpráv čeká po opětovném stahování\n"
 
-#: imap.c:774
+#: imap.c:781
 msgid "mailbox selection failed\n"
 msgstr "výběr poštovní schránky selhal\n"
 
 # c-format
-#: imap.c:778
+#: imap.c:785
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
@@ -1704,11 +1709,11 @@ msgstr[0] "%d zpráva čeká po prvním stahování\n"
 msgstr[1] "%d zprávy čekají po prvním stahování\n"
 msgstr[2] "%d zpráv čeká po prvním stahování\n"
 
-#: imap.c:792
+#: imap.c:799
 msgid "expunge failed\n"
 msgstr "čištění selhalo\n"
 
-#: imap.c:796
+#: imap.c:803
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
@@ -1716,21 +1721,21 @@ msgstr[0] "%d zpráva čeká po vyčištění\n"
 msgstr[1] "%d zprávy čekají po vyčištění\n"
 msgstr[2] "%d zpráv čeká po vyčištění\n"
 
-#: imap.c:838
+#: imap.c:845
 msgid "search for unseen messages failed\n"
 msgstr "hledání nepřečtených zpráv selhalo\n"
 
-#: imap.c:866
+#: imap.c:873
 #, fuzzy, c-format
 msgid "%lu is unseen\n"
 msgstr "%u nebyla přečtena\n"
 
-#: imap.c:878 pop3.c:788
+#: imap.c:885 pop3.c:796
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u je první nepřečtená\n"
 
-#: imap.c:969
+#: imap.c:976
 msgid ""
 "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr ""
@@ -1927,7 +1932,7 @@ msgstr "od serveru přijato fatální\n"
 msgid "Could not decode OTP challenge\n"
 msgstr "Nemohu dekódovat výzvu OTP\n"
 
-#: opie.c:64 pop3.c:552
+#: opie.c:64 pop3.c:560
 msgid "Secret pass phrase: "
 msgstr "Tajné heslo: "
 
@@ -2233,59 +2238,59 @@ msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 "      --showdots    zobrazovat tečky průběhu i v souborech se záznamy\n"
 
-#: pop3.c:342
+#: pop3.c:343
 msgid ""
 "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
 "of TOP.\n"
 msgstr ""
 
-#: pop3.c:590
+#: pop3.c:598
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Požadovaný časový údaj APOP nebyl v pozdravu nalezen\n"
 
-#: pop3.c:599
+#: pop3.c:607
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Syntaktická chyba v časovém údaji z pozdravu\n"
 
-#: pop3.c:621
+#: pop3.c:629
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Žádost o nedefinovaný protokol v POP3_auth\n"
 
-#: pop3.c:629
+#: pop3.c:637
 msgid "lock busy!  Is another session active?\n"
 msgstr "zamčeno! Je aktivní jiné sezení?\n"
 
-#: pop3.c:708
+#: pop3.c:716
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr ""
 
-#: pop3.c:731
+#: pop3.c:739
 msgid "Server responded with UID for wrong message.\n"
 msgstr ""
 
-#: pop3.c:758 pop3.c:1004
+#: pop3.c:766 pop3.c:1012
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (num=%d) bylo odstraněno, ale je stále přítomno!\n"
 
-#: pop3.c:767 pop3.c:779 pop3.c:1013 pop3.c:1020
+#: pop3.c:775 pop3.c:787 pop3.c:1021 pop3.c:1028
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u nebyla přečtena\n"
 
-#: pop3.c:864
+#: pop3.c:872
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr "Zprávy vloženy do seznamu na serveru. To neumím zpracovat.\n"
 
-#: pop3.c:956
+#: pop3.c:964
 msgid "protocol error\n"
 msgstr "chyba protokolu\n"
 
-#: pop3.c:972
+#: pop3.c:980
 msgid "protocol error while fetching UIDLs\n"
 msgstr "chyba protokolu při stahování UIDL\n"
 
-#: pop3.c:1342
+#: pop3.c:1350
 #, fuzzy
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Přepínač --remote není s POP3 podporován\n"
diff --git a/po/de.po b/po/de.po
index 8b92728c..05ae1cdf 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.4-rc2\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2006-09-27 00:05+0200\n"
+"POT-Creation-Date: 2006-11-01 23:48+0100\n"
 "PO-Revision-Date: 2006-09-18 11:04+0200\n"
 "Last-Translator: Matthias Andree <matthias.andree@gmx.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -256,7 +256,7 @@ msgstr "Subject: Fetchmail-Warnung: Server nicht erreichbar."
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail konnte keine Mail von %s erhalten:"
 
-#: driver.c:1096 imap.c:423 pop3.c:465
+#: driver.c:1096
 msgid "SSL connection failed.\n"
 msgstr "SSL-Verbindung fehlgeschlagen.\n"
 
@@ -1688,76 +1688,80 @@ msgstr "Protokoll identifiziert als IMAP2 oder IMAP2BIS\n"
 msgid "will idle after poll\n"
 msgstr "werde nach Abfrage untätig sein\n"
 
-#: imap.c:427 pop3.c:469
+#: imap.c:424 imap.c:447 pop3.c:466 pop3.c:489
+msgid "TLS connection failed.\n"
+msgstr "TLS-Verbindung fehlgeschlagen.\n"
+
+#: imap.c:429 pop3.c:470
 #, c-format
 msgid "%s: opportunistic upgrade to TLS.\n"
 msgstr "%s: opportunistisches Upgrade auf TLS.\n"
 
-#: imap.c:540
+#: imap.c:547
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Benötigte OTP-Fähigkeit nicht in fetchmail einkompiliert\n"
 
-#: imap.c:562 pop3.c:372
+#: imap.c:569 pop3.c:373
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Benötigte NTLM-Fähigkeit nicht in fetchmail einkompiliert\n"
 
-#: imap.c:571
+#: imap.c:578
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Benötigte LOGIN-Fähigkeit nicht vom Server unterstützt\n"
 
-#: imap.c:645
+#: imap.c:652
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr "unerwartete Expunge-Bestätigung (%d tatsächlich != %d erwartet)\n"
 
-#: imap.c:749 imap.c:808
+#: imap.c:756 imap.c:815
 msgid "re-poll failed\n"
 msgstr "erneute Abfrage fehlgeschlagen\n"
 
-#: imap.c:757 imap.c:813
+#: imap.c:764 imap.c:820
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "%d Nachricht wartet nach erneuter Abfrage\n"
 msgstr[1] "%d Nachrichten warten nach erneuter Abfrage\n"
 
-#: imap.c:774
+#: imap.c:781
 msgid "mailbox selection failed\n"
 msgstr "Postfach-Auswahl fehlgeschlagen\n"
 
-#: imap.c:778
+#: imap.c:785
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "%d Nachricht wartet nach der ersten Abfrage\n"
 msgstr[1] "%d Nachrichten warten nach der ersten Abfrage\n"
 
-#: imap.c:792
+#: imap.c:799
 msgid "expunge failed\n"
 msgstr "Säubern fehlgeschlagen\n"
 
-#: imap.c:796
+#: imap.c:803
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "%d Nachricht wartet nach dem Löschen\n"
 msgstr[1] "%d Nachrichten warten nach dem Löschen\n"
 
-#: imap.c:838
+#: imap.c:845
 msgid "search for unseen messages failed\n"
 msgstr "Suche nach ungesehenen Nachrichten fehlgeschlagen\n"
 
-#: imap.c:866
+#: imap.c:873
 #, c-format
 msgid "%lu is unseen\n"
 msgstr "%lu ist ungesehen\n"
 
-#: imap.c:878 pop3.c:788
+#: imap.c:885 pop3.c:796
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u ist erste ungesehene\n"
 
-#: imap.c:969
+#: imap.c:976
 msgid ""
 "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr "Warnung: ignoriere falsche Größendaten vom Server.\n"
@@ -1954,7 +1958,7 @@ msgstr "Server recv fatal\n"
 msgid "Could not decode OTP challenge\n"
 msgstr "Konnte OTP-Herausforderung nicht dekodieren\n"
 
-#: opie.c:64 pop3.c:552
+#: opie.c:64 pop3.c:560
 msgid "Secret pass phrase: "
 msgstr "Geheime Passphrase: "
 
@@ -2257,7 +2261,7 @@ msgstr "  -r, --folder      Namen des entfernten Ordners angeben\n"
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr "      --showdots    Fortschrittspunkte auch in Log-Dateien zeigen\n"
 
-#: pop3.c:342
+#: pop3.c:343
 msgid ""
 "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
 "of TOP.\n"
@@ -2265,53 +2269,53 @@ msgstr ""
 "Warnung: „Maillennium POP3/PROXY-Server” gefunden, benutze RETR-Befehl statt "
 "TOP.\n"
 
-#: pop3.c:590
+#: pop3.c:598
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Erforderlicher APOP-Zeitstempel nicht in Begrüßung gefunden\n"
 
-#: pop3.c:599
+#: pop3.c:607
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Zeitstempel-Syntax-Fehler in Begrüßung\n"
 
-#: pop3.c:621
+#: pop3.c:629
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Anfrage nach undefiniertem Protokoll in POP3_auth\n"
 
-#: pop3.c:629
+#: pop3.c:637
 msgid "lock busy!  Is another session active?\n"
 msgstr "Lock beschäftigt!  Ist eine weitere Sitzung aktiv?\n"
 
-#: pop3.c:708
+#: pop3.c:716
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "Kann die UIDL-Antwort des Servers nicht verarbeiten.\n"
 
-#: pop3.c:731
+#: pop3.c:739
 msgid "Server responded with UID for wrong message.\n"
 msgstr "Server hat mit UID der falschen Nachricht geantwortet.\n"
 
-#: pop3.c:758 pop3.c:1004
+#: pop3.c:766 pop3.c:1012
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (num=%d) wurde gelöscht, ist aber immer noch da!\n"
 
-#: pop3.c:767 pop3.c:779 pop3.c:1013 pop3.c:1020
+#: pop3.c:775 pop3.c:787 pop3.c:1021 pop3.c:1028
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u ist ungesehen\n"
 
-#: pop3.c:864
+#: pop3.c:872
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr "Nachrichten in Liste auf Server eingefügt. Kann damit nicht umgehen.\n"
 
-#: pop3.c:956
+#: pop3.c:964
 msgid "protocol error\n"
 msgstr "Protokollfehler\n"
 
-#: pop3.c:972
+#: pop3.c:980
 msgid "protocol error while fetching UIDLs\n"
 msgstr "Protokollfehler beim Holen der UIDL\n"
 
-#: pop3.c:1342
+#: pop3.c:1350
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Option --folder wird mit POP3 nicht unterstützt\n"
 
diff --git a/po/es.po b/po/es.po
index 2c444ff3..b562d2cf 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.4-rc1\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2006-09-27 00:05+0200\n"
+"POT-Creation-Date: 2006-11-01 23:48+0100\n"
 "PO-Revision-Date: 2006-09-15 11:52+0200\n"
 "Last-Translator: Héctor García <hector@el-mundo.net>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -258,7 +258,7 @@ msgstr "Subject: aviso de server fuera de alcance de fetchmail."
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail no puede alcanzar al servidor de correo %s:"
 
-#: driver.c:1096 imap.c:423 pop3.c:465
+#: driver.c:1096
 msgid "SSL connection failed.\n"
 msgstr "Fallo en la conexión SSL.\n"
 
@@ -1700,76 +1700,81 @@ msgstr "Protocolo identificado como IMAP2 o IMAP2BIS\n"
 msgid "will idle after poll\n"
 msgstr "descansará después de inquirir\n"
 
-#: imap.c:427 pop3.c:469
+#: imap.c:424 imap.c:447 pop3.c:466 pop3.c:489
+#, fuzzy
+msgid "TLS connection failed.\n"
+msgstr "Fallo en la conexión SSL.\n"
+
+#: imap.c:429 pop3.c:470
 #, c-format
 msgid "%s: opportunistic upgrade to TLS.\n"
 msgstr "%s: actualización oportunista a TLS.\n"
 
-#: imap.c:540
+#: imap.c:547
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "La capacidad OTP requerida no fue compilada en fetchmail\n"
 
-#: imap.c:562 pop3.c:372
+#: imap.c:569 pop3.c:373
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "La capacidad NTLM requerida no fue compilada en fetchmail\n"
 
-#: imap.c:571
+#: imap.c:578
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "La capacidad LOGIN requerida no es soportada por el servidor\n"
 
-#: imap.c:645
+#: imap.c:652
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr "inconsistencia en borrado de mensajes (%d actual != %d esperado)\n"
 
-#: imap.c:749 imap.c:808
+#: imap.c:756 imap.c:815
 msgid "re-poll failed\n"
 msgstr "falló el reintento de consulta\n"
 
-#: imap.c:757 imap.c:813
+#: imap.c:764 imap.c:820
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "Queda %d mensaje esperando tras reintentar la consulta\n"
 msgstr[1] "Quedan %d mensajes esperando tras reintentar la consulta\n"
 
-#: imap.c:774
+#: imap.c:781
 msgid "mailbox selection failed\n"
 msgstr "falló la selección de casilla\n"
 
-#: imap.c:778
+#: imap.c:785
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "Queda %d mensaje esperando tras la consulta inicial\n"
 msgstr[1] "Quedan %d mensajes esperando tras la consulta inicial\n"
 
-#: imap.c:792
+#: imap.c:799
 msgid "expunge failed\n"
 msgstr "falló la eliminación\n"
 
-#: imap.c:796
+#: imap.c:803
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "Queda %d mensaje esperando tras la eliminación\n"
 msgstr[1] "Quedan %d mensajes esperando tras la eliminación\n"
 
-#: imap.c:838
+#: imap.c:845
 msgid "search for unseen messages failed\n"
 msgstr "la búsqueda de mensajes no visto falló\n"
 
-#: imap.c:866
+#: imap.c:873
 #, c-format
 msgid "%lu is unseen\n"
 msgstr "%lu no fue visto\n"
 
-#: imap.c:878 pop3.c:788
+#: imap.c:885 pop3.c:796
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u es el primero que no fue visto\n"
 
-#: imap.c:969
+#: imap.c:976
 msgid ""
 "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr ""
@@ -1969,7 +1974,7 @@ msgstr "fatal recv del server\n"
 msgid "Could not decode OTP challenge\n"
 msgstr "No fue posible decodificar el desafío OTP\n"
 
-#: opie.c:64 pop3.c:552
+#: opie.c:64 pop3.c:560
 msgid "Secret pass phrase: "
 msgstr "Frase clave secreta: "
 
@@ -2293,7 +2298,7 @@ msgstr ""
 "      --showdots    mostrar puntos de progreso incluso en los archivos de "
 "registro\n"
 
-#: pop3.c:342
+#: pop3.c:343
 msgid ""
 "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
 "of TOP.\n"
@@ -2301,54 +2306,54 @@ msgstr ""
 "Aviso: encontrado \"Maillennium POP3/PROXY server\", usando el comando RETR "
 "en lugar de TOP.\n"
 
-#: pop3.c:590
+#: pop3.c:598
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Estampa de tiempo APOP requerida no encontrada en el saludo\n"
 
-#: pop3.c:599
+#: pop3.c:607
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Error de sintaxis en la estampa de tiempo en el saludo\n"
 
-#: pop3.c:621
+#: pop3.c:629
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Pedido de protocolo indefinido en POP3_auth\n"
 
-#: pop3.c:629
+#: pop3.c:637
 msgid "lock busy!  Is another session active?\n"
 msgstr "¡bloqueo ocupado! ¿Hay otra sesión activa?\n"
 
-#: pop3.c:708
+#: pop3.c:716
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "No se puede manejar la respuesta UIDL proveniente del servidor.\n"
 
-#: pop3.c:731
+#: pop3.c:739
 msgid "Server responded with UID for wrong message.\n"
 msgstr "El servidor devolvió el UID de un mensaje incorrecto.\n"
 
-#: pop3.c:758 pop3.c:1004
+#: pop3.c:766 pop3.c:1012
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (num=%d) fue borrado, ¡pero aún se encuentra presente!\n"
 
-#: pop3.c:767 pop3.c:779 pop3.c:1013 pop3.c:1020
+#: pop3.c:775 pop3.c:787 pop3.c:1021 pop3.c:1028
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u no fue visto\n"
 
-#: pop3.c:864
+#: pop3.c:872
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr ""
 "Mensajes insertados en una lista en el servidor. No se puede manejar esto.\n"
 
-#: pop3.c:956
+#: pop3.c:964
 msgid "protocol error\n"
 msgstr "error de protocolo\n"
 
-#: pop3.c:972
+#: pop3.c:980
 msgid "protocol error while fetching UIDLs\n"
 msgstr "error de protocolo durante la recepción de UIDLs\n"
 
-#: pop3.c:1342
+#: pop3.c:1350
 msgid "Option --folder is not supported with POP3\n"
 msgstr "La opción --folder no está soportada con POP3\n"
 
diff --git a/po/fr.po b/po/fr.po
index 70da9bc8..53a42d56 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.2.9-rc9\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2006-09-27 00:05+0200\n"
+"POT-Creation-Date: 2006-11-01 23:48+0100\n"
 "PO-Revision-Date: 2005-12-18 11:50+0100\n"
 "Last-Translator: Matthias Andree <matthias.andree@gmx.de>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -262,7 +262,7 @@ msgstr "Subject: avertissement de serveur non accessible par Fetchmail."
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail n'a pas pu recevoir le courrier de %s:"
 
-#: driver.c:1096 imap.c:423 pop3.c:465
+#: driver.c:1096
 msgid "SSL connection failed.\n"
 msgstr "Échec de la connexion SSL\n"
 
@@ -1703,77 +1703,81 @@ msgstr "Protocole identifié comme étant IMAP2 ou IMAP2BIS\n"
 msgid "will idle after poll\n"
 msgstr "attendra après la réception\n"
 
-#: imap.c:427 pop3.c:469
+#: imap.c:424 imap.c:447 pop3.c:466 pop3.c:489
+msgid "TLS connection failed.\n"
+msgstr "Échec de la connexion TLS.\n"
+
+#: imap.c:429 pop3.c:470
 #, c-format
 msgid "%s: opportunistic upgrade to TLS.\n"
 msgstr ""
 
-#: imap.c:540
+#: imap.c:547
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "La fonctionnalité OTP requise n'est pas supportée par fetchmail\n"
 
-#: imap.c:562 pop3.c:372
+#: imap.c:569 pop3.c:373
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "La fonctionnalité NTLM requise n'est pas supportée par fetchmail.\n"
 
-#: imap.c:571
+#: imap.c:578
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "La fonction LOGIN requise n'est pas supportée par le serveur\n"
 
-#: imap.c:645
+#: imap.c:652
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr ""
 "pas de concordance de la punge des messages (%d effectiv != %d attendue)\n"
 
-#: imap.c:749 imap.c:808
+#: imap.c:756 imap.c:815
 msgid "re-poll failed\n"
 msgstr "échec durant la re-réception\n"
 
-#: imap.c:757 imap.c:813
+#: imap.c:764 imap.c:820
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "%d message en attente après le nouveau poll\n"
 msgstr[1] "%d messages en attente après le nouveau poll\n"
 
-#: imap.c:774
+#: imap.c:781
 msgid "mailbox selection failed\n"
 msgstr "échec de la sélection de boîte aux lettres\n"
 
-#: imap.c:778
+#: imap.c:785
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "%d message en attente après le premier poll\n"
 msgstr[1] "%d messages en attente après le premier poll\n"
 
-#: imap.c:792
+#: imap.c:799
 msgid "expunge failed\n"
 msgstr "échec de la purge\n"
 
-#: imap.c:796
+#: imap.c:803
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "%d message en attente après la purge\n"
 msgstr[1] "%d messages en attente après la purge\n"
 
-#: imap.c:838
+#: imap.c:845
 msgid "search for unseen messages failed\n"
 msgstr "échec de la recherche des messages non-vus\n"
 
-#: imap.c:866
+#: imap.c:873
 #, c-format
 msgid "%lu is unseen\n"
 msgstr "%lu n'est pas vu\n"
 
-#: imap.c:878 pop3.c:788
+#: imap.c:885 pop3.c:796
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u est le premier a n'avoir pas été vu\n"
 
-#: imap.c:969
+#: imap.c:976
 msgid ""
 "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr ""
@@ -1971,7 +1975,7 @@ msgstr "erreur fatale de recv serveur\n"
 msgid "Could not decode OTP challenge\n"
 msgstr "Impossible de décoder le challenge OTP\n"
 
-#: opie.c:64 pop3.c:552
+#: opie.c:64 pop3.c:560
 msgid "Secret pass phrase: "
 msgstr "Phrase de passe secrète : "
 
@@ -2289,7 +2293,7 @@ msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 "      --showdots    affiche des points de progression, même dans le journal\n"
 
-#: pop3.c:342
+#: pop3.c:343
 msgid ""
 "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
 "of TOP.\n"
@@ -2297,53 +2301,53 @@ msgstr ""
 "Avertissement: trouvé «Maillennium POP3/PROXY server», la commande RETR est "
 "utilisé au lieu de TOP.\n"
 
-#: pop3.c:590
+#: pop3.c:598
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "L'horodatage APOP requis est absent du message d'invitation\n"
 
-#: pop3.c:599
+#: pop3.c:607
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Erreur de syntaxe dans l'horodatage du message d'invitation\n"
 
-#: pop3.c:621
+#: pop3.c:629
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Requête de protocole indéfinie dans POP3_auth\n"
 
-#: pop3.c:629
+#: pop3.c:637
 msgid "lock busy!  Is another session active?\n"
 msgstr "Fichier verrou en service. Y'a-t-il une autre session active ?\n"
 
-#: pop3.c:708
+#: pop3.c:716
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "Ne peux pas manier la réponse UIDL du serveur.\n"
 
-#: pop3.c:731
+#: pop3.c:739
 msgid "Server responded with UID for wrong message.\n"
 msgstr "Serveur répondait avec UID d'un faux message.\n"
 
-#: pop3.c:758 pop3.c:1004
+#: pop3.c:766 pop3.c:1012
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (num=%d) a été effacé, mais est toujours présent !\n"
 
-#: pop3.c:767 pop3.c:779 pop3.c:1013 pop3.c:1020
+#: pop3.c:775 pop3.c:787 pop3.c:1021 pop3.c:1028
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u n'est pas vu\n"
 
-#: pop3.c:864
+#: pop3.c:872
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr "Messages insérés dans une liste du serveur. Impossible de gérer ça.\n"
 
-#: pop3.c:956
+#: pop3.c:964
 msgid "protocol error\n"
 msgstr "erreur de protocole\n"
 
-#: pop3.c:972
+#: pop3.c:980
 msgid "protocol error while fetching UIDLs\n"
 msgstr "erreur de protocole durant la réception des UIDLs\n"
 
-#: pop3.c:1342
+#: pop3.c:1350
 msgid "Option --folder is not supported with POP3\n"
 msgstr "L'option --folder n'est pas supportée avec POP3\n"
 
diff --git a/po/ja.po b/po/ja.po
index e2c43bc0..56ca38f9 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.5-b3\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2006-09-27 00:05+0200\n"
+"POT-Creation-Date: 2006-11-01 23:48+0100\n"
 "PO-Revision-Date: 2006-09-29 07:29+0900\n"
 "Last-Translator: Takeshi Hamasaki <hma@syd.odn.ne.jp>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -253,7 +253,7 @@ msgstr "Subject: Fetchmail 警告 : サーバと交信不能"
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail 実行中にメールサーバ %s と交信できませんでした:"
 
-#: driver.c:1096 imap.c:423 pop3.c:465
+#: driver.c:1096
 msgid "SSL connection failed.\n"
 msgstr "SSL による接続に失敗しました。\n"
 
@@ -1659,74 +1659,79 @@ msgstr "プロトコルは IMAP2 又は IMAP2BIS と認識されました。\n"
 msgid "will idle after poll\n"
 msgstr "接続の後、休止します。\n"
 
-#: imap.c:427 pop3.c:469
+#: imap.c:424 imap.c:447 pop3.c:466 pop3.c:489
+#, fuzzy
+msgid "TLS connection failed.\n"
+msgstr "SSL による接続に失敗しました。\n"
+
+#: imap.c:429 pop3.c:470
 #, c-format
 msgid "%s: opportunistic upgrade to TLS.\n"
 msgstr "%s: TLS へのアップグレードに適合。\n"
 
-#: imap.c:540
+#: imap.c:547
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr ""
 "OTP が要求されましたが、fetchmail が OTP 対応でコンパイルされていません。\n"
 
-#: imap.c:562 pop3.c:372
+#: imap.c:569 pop3.c:373
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "要求された NTLM 処理能力は fetchmail に組み込まれていません。\n"
 
-#: imap.c:571
+#: imap.c:578
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "要求された LOGIN 処理能力はサーバでサポートされていません。\n"
 
-#: imap.c:645
+#: imap.c:652
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr "メッセージの大きさが合いません (%d (実際) != %d (予想)) \n"
 
-#: imap.c:749 imap.c:808
+#: imap.c:756 imap.c:815
 msgid "re-poll failed\n"
 msgstr "再アクセスに失敗しました。\n"
 
-#: imap.c:757 imap.c:813
+#: imap.c:764 imap.c:820
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "%d 通のメッセージが再アクセスの後に存在します。\n"
 
-#: imap.c:774
+#: imap.c:781
 msgid "mailbox selection failed\n"
 msgstr "メールボックスの選択に失敗しました\n"
 
-#: imap.c:778
+#: imap.c:785
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "最初のアクセスから %d 通のメッセージがあります。\n"
 
-#: imap.c:792
+#: imap.c:799
 msgid "expunge failed\n"
 msgstr "削除に失敗しました。\n"
 
-#: imap.c:796
+#: imap.c:803
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "削除の後、%d 通のメッセージが残っています。\n"
 
-#: imap.c:838
+#: imap.c:845
 msgid "search for unseen messages failed\n"
 msgstr "未読メッセージの検索に失敗しました。\n"
 
-#: imap.c:866
+#: imap.c:873
 #, c-format
 msgid "%lu is unseen\n"
 msgstr "%lu は未読です。\n"
 
-#: imap.c:878 pop3.c:788
+#: imap.c:885 pop3.c:796
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u は最初の未読メッセージです。\n"
 
-#: imap.c:969
+#: imap.c:976
 msgid ""
 "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr ""
@@ -1926,7 +1931,7 @@ msgstr "server recv fatal\n"
 msgid "Could not decode OTP challenge\n"
 msgstr "OTP challenge のデコードが出来ませんでした。\n"
 
-#: opie.c:64 pop3.c:552
+#: opie.c:64 pop3.c:560
 msgid "Secret pass phrase: "
 msgstr "Secret pass phrase: "
 
@@ -2235,7 +2240,7 @@ msgstr "  -r, --folder      サーバのメールフォルダを指定します\
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr "      --showdots    ログファイルにも進行状況を示す . を書き込みます\n"
 
-#: pop3.c:342
+#: pop3.c:343
 msgid ""
 "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
 "of TOP.\n"
@@ -2243,54 +2248,54 @@ msgstr ""
 "警告: Maillennium POP3/プロクシサーバです。TOP の代わりに RETR コマンドを使用"
 "します。\n"
 
-#: pop3.c:590
+#: pop3.c:598
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "greeting 中に APOP timestamp が存在しません。\n"
 
-#: pop3.c:599
+#: pop3.c:607
 msgid "Timestamp syntax error in greeting\n"
 msgstr "greeting 中の timestamp が不正です。\n"
 
-#: pop3.c:621
+#: pop3.c:629
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "POP3_auth 中で定義されていないプロトコルが要求されました。\n"
 
-#: pop3.c:629
+#: pop3.c:637
 msgid "lock busy!  Is another session active?\n"
 msgstr "lock busy 状態です。別の交信が行われていないか確認して下さい。\n"
 
-#: pop3.c:708
+#: pop3.c:716
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "上流サーバからの UIDL 応答に対応できません。\n"
 
-#: pop3.c:731
+#: pop3.c:739
 msgid "Server responded with UID for wrong message.\n"
 msgstr "サーバが誤ったメッセージの UID に応答しました。\n"
 
-#: pop3.c:758 pop3.c:1004
+#: pop3.c:766 pop3.c:1012
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (num=%d) は削除されましたが、まだ存在しています!\n"
 
-#: pop3.c:767 pop3.c:779 pop3.c:1013 pop3.c:1020
+#: pop3.c:775 pop3.c:787 pop3.c:1021 pop3.c:1028
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u は未読です。\n"
 
-#: pop3.c:864
+#: pop3.c:872
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr ""
 "サーバリストにメッセージが挿入されています。取り扱うことができません。\n"
 
-#: pop3.c:956
+#: pop3.c:964
 msgid "protocol error\n"
 msgstr "プロトコルエラーです。\n"
 
-#: pop3.c:972
+#: pop3.c:980
 msgid "protocol error while fetching UIDLs\n"
 msgstr "UIDL を取り込み中にプロトコルエラーが発生しました。\n"
 
-#: pop3.c:1342
+#: pop3.c:1350
 msgid "Option --folder is not supported with POP3\n"
 msgstr "POP3 では --folder オプションは利用できません。\n"
 
diff --git a/po/pl.po b/po/pl.po
index 330b524f..f9d7bc01 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.5-b3\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2006-09-27 00:05+0200\n"
+"POT-Creation-Date: 2006-11-01 23:48+0100\n"
 "PO-Revision-Date: 2006-10-02 07:40+0200\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -251,7 +251,7 @@ msgstr "Subject: Ostrze�enie fetchmaila o nieosi�galnym serwerze."
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail nie m�g� po��czy� si� z serwerem poczty %s:"
 
-#: driver.c:1096 imap.c:423 pop3.c:465
+#: driver.c:1096
 msgid "SSL connection failed.\n"
 msgstr "po��czenie SSL nie powiod�o si�.\n"
 
@@ -1685,33 +1685,38 @@ msgstr "Protok� rozpoznany jako IMAP2 lub IMAP2BIS\n"
 msgid "will idle after poll\n"
 msgstr "przejdzie w stan bezczynno�ci po odpytaniu\n"
 
-#: imap.c:427 pop3.c:469
+#: imap.c:424 imap.c:447 pop3.c:466 pop3.c:489
+#, fuzzy
+msgid "TLS connection failed.\n"
+msgstr "po��czenie SSL nie powiod�o si�.\n"
+
+#: imap.c:429 pop3.c:470
 #, c-format
 msgid "%s: opportunistic upgrade to TLS.\n"
 msgstr "%s: zgodne przej�cie na TLS.\n"
 
-#: imap.c:540
+#: imap.c:547
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Wymagana metoda uwierzytelnienia OTP nie wkompilowana w fetchmaila\n"
 
-#: imap.c:562 pop3.c:372
+#: imap.c:569 pop3.c:373
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Wymagana metoda uwierzytelnienia NTLM nie wkompilowana w fetchmaila\n"
 
-#: imap.c:571
+#: imap.c:578
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Serwer nie obs�uguje wymaganej metody uwierzytelnienia LOGIN\n"
 
-#: imap.c:645
+#: imap.c:652
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr "niezgodno�� przy usuwaniu poczty (faktyczna %d != oczekiwana %d)\n"
 
-#: imap.c:749 imap.c:808
+#: imap.c:756 imap.c:815
 msgid "re-poll failed\n"
 msgstr "ponowne po��czenie nie powiod�o si�\n"
 
-#: imap.c:757 imap.c:813
+#: imap.c:764 imap.c:820
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
@@ -1719,11 +1724,11 @@ msgstr[0] "%d list oczekuj�cy po ponownym pobraniu\n"
 msgstr[1] "%d listy oczekuj�ce po ponownym pobraniu\n"
 msgstr[2] "%d list�w oczekuj�cych po ponownym pobraniu\n"
 
-#: imap.c:774
+#: imap.c:781
 msgid "mailbox selection failed\n"
 msgstr "wyb�r skrzynki zako�czy� si� niepowodzeniem\n"
 
-#: imap.c:778
+#: imap.c:785
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
@@ -1731,11 +1736,11 @@ msgstr[0] "%d list oczekuj�cy po pierwszym pobraniu\n"
 msgstr[1] "%d listy oczekuj�ce po pierwszym pobraniu\n"
 msgstr[2] "%d list�w oczekuj�cych po pierwszym pobraniu\n"
 
-#: imap.c:792
+#: imap.c:799
 msgid "expunge failed\n"
 msgstr "usuwanie nie powiod�o si�\n"
 
-#: imap.c:796
+#: imap.c:803
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
@@ -1743,21 +1748,21 @@ msgstr[0] "%d list oczekuj�cy po usuwaniu\n"
 msgstr[1] "%d listy oczekuj�ce po usuwaniu\n"
 msgstr[2] "%d list�w oczekuj�cych po usuwaniu\n"
 
-#: imap.c:838
+#: imap.c:845
 msgid "search for unseen messages failed\n"
 msgstr "poszukiwanie nieprzeczytanych list�w nie powiod�o si�\n"
 
-#: imap.c:866
+#: imap.c:873
 #, c-format
 msgid "%lu is unseen\n"
 msgstr "%lu jest nieprzeczytany\n"
 
-#: imap.c:878 pop3.c:788
+#: imap.c:885 pop3.c:796
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u jest pierwszym nieprzeczytanym\n"
 
-#: imap.c:969
+#: imap.c:976
 msgid ""
 "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr ""
@@ -1957,7 +1962,7 @@ msgstr "recv z serwera nie powiod�o si�\n"
 msgid "Could not decode OTP challenge\n"
 msgstr "Rozkodowanie wyzwania OTP by�o niemo�liwe\n"
 
-#: opie.c:64 pop3.c:552
+#: opie.c:64 pop3.c:560
 msgid "Secret pass phrase: "
 msgstr "Tajne has�o: "
 
@@ -2275,7 +2280,7 @@ msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 "      --showdots    pokazuje kropki oznaczaj�ce post�p tak�e w logach\n"
 
-#: pop3.c:342
+#: pop3.c:343
 msgid ""
 "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
 "of TOP.\n"
@@ -2283,54 +2288,54 @@ msgstr ""
 "Uwaga: Odkryto serwer \"POP3/PROXY Maillennium\", u�ycie polecenia RETR "
 "zamiast TOP.\n"
 
-#: pop3.c:590
+#: pop3.c:598
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "W powitaniu serwera brakuje wymaganego znacznika czasu APOP\n"
 
-#: pop3.c:599
+#: pop3.c:607
 msgid "Timestamp syntax error in greeting\n"
 msgstr "B��d sk�adni znacznika czasu w powitaniu\n"
 
-#: pop3.c:621
+#: pop3.c:629
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "Pro�ba o nieznany protok� w POP3_auth\n"
 
-#: pop3.c:629
+#: pop3.c:637
 msgid "lock busy!  Is another session active?\n"
 msgstr "plik zablokowany! Czy inna sesja nie jest aktywna?\n"
 
-#: pop3.c:708
+#: pop3.c:716
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "Nie mo�na obs�u�y� odpowiedzi UIDL od serwera.\n"
 
-#: pop3.c:731
+#: pop3.c:739
 msgid "Server responded with UID for wrong message.\n"
 msgstr "Serwer odpowiedzia� z UID-em dla niew�a�ciwego listu.\n"
 
-#: pop3.c:758 pop3.c:1004
+#: pop3.c:766 pop3.c:1012
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (num=%d) zosta� skasowany, ale nadal istnieje!\n"
 
-#: pop3.c:767 pop3.c:779 pop3.c:1013 pop3.c:1020
+#: pop3.c:775 pop3.c:787 pop3.c:1021 pop3.c:1028
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u jest nieprzeczytany\n"
 
-#: pop3.c:864
+#: pop3.c:872
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr ""
 "Przesy�ki zosta�y dodane do listy na serwerze. Nie mog� tego obs�u�y�.\n"
 
-#: pop3.c:956
+#: pop3.c:964
 msgid "protocol error\n"
 msgstr "b��d protoko�u\n"
 
-#: pop3.c:972
+#: pop3.c:980
 msgid "protocol error while fetching UIDLs\n"
 msgstr "b��d protoko�u podczas pobierania UIDL\n"
 
-#: pop3.c:1342
+#: pop3.c:1350
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Opcja --folder nie dzia�a z POP3\n"
 
diff --git a/po/ru.po b/po/ru.po
index 965c3cef..4c067e41 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.5-b3\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2006-09-27 00:05+0200\n"
+"POT-Creation-Date: 2006-11-01 23:48+0100\n"
 "PO-Revision-Date: 2006-09-29 15:51+0300\n"
 "Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -254,7 +254,7 @@ msgstr "����: �������������� Fetchmail � ������������� �������."
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail �� ���� ���������� ����� � �������� �������� %s:"
 
-#: driver.c:1096 imap.c:423 pop3.c:465
+#: driver.c:1096
 msgid "SSL connection failed.\n"
 msgstr "����������� ����� SSL ����������� ��������.\n"
 
@@ -1679,76 +1679,81 @@ msgstr "�������� ��������������� ��� IMAP2 ��� IMAP2BIS\n"
 msgid "will idle after poll\n"
 msgstr "����� ������������� ����� ������\n"
 
-#: imap.c:427 pop3.c:469
+#: imap.c:424 imap.c:447 pop3.c:466 pop3.c:489
+#, fuzzy
+msgid "TLS connection failed.\n"
+msgstr "����������� ����� SSL ����������� ��������.\n"
+
+#: imap.c:429 pop3.c:470
 #, c-format
 msgid "%s: opportunistic upgrade to TLS.\n"
 msgstr "%s: ���������� �� TLS.\n"
 
-#: imap.c:540
+#: imap.c:547
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Fetchmail ������������� ��� ��������� ��������� OTP\n"
 
-#: imap.c:562 pop3.c:372
+#: imap.c:569 pop3.c:373
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Fetchmail ������������� ��� ��������� ��������� NTLM\n"
 
-#: imap.c:571
+#: imap.c:578
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "��������� ����� LOGIN �� �������������� ��������\n"
 
-#: imap.c:645
+#: imap.c:652
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr "����������� ��� �������� ����� (%d �� ����� ���� != %d ���������)\n"
 
-#: imap.c:749 imap.c:808
+#: imap.c:756 imap.c:815
 msgid "re-poll failed\n"
 msgstr "��������� ����� ���������� ��������\n"
 
-#: imap.c:757 imap.c:813
+#: imap.c:764 imap.c:820
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "��������� %d ��������� ����� ���������� ������\n"
 msgstr[1] "��������� %d ��������� ����� ���������� ������\n"
 
-#: imap.c:774
+#: imap.c:781
 msgid "mailbox selection failed\n"
 msgstr "����� ��������� ����� ���������� ��������\n"
 
-#: imap.c:778
+#: imap.c:785
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "��������� %d ��������� ����� ������� ������\n"
 msgstr[1] "��������� %d ��������� ����� ������� ������\n"
 
-#: imap.c:792
+#: imap.c:799
 msgid "expunge failed\n"
 msgstr "�������� ����������� ��������\n"
 
-#: imap.c:796
+#: imap.c:803
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "��������� %d ��������� ����� ��������\n"
 msgstr[1] "��������� %d ��������� ����� ��������\n"
 
-#: imap.c:838
+#: imap.c:845
 msgid "search for unseen messages failed\n"
 msgstr "����� �� ������������� ��������� ���������� ��������\n"
 
-#: imap.c:866
+#: imap.c:873
 #, c-format
 msgid "%lu is unseen\n"
 msgstr "%lu �� �����������\n"
 
-#: imap.c:878 pop3.c:788
+#: imap.c:885 pop3.c:796
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u ������ �� �������������\n"
 
-#: imap.c:969
+#: imap.c:976
 msgid ""
 "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr ""
@@ -1947,7 +1952,7 @@ msgstr "������ ��������� ���������\n"
 msgid "Could not decode OTP challenge\n"
 msgstr "���������� ���� ������������ ������ OTP\n"
 
-#: opie.c:64 pop3.c:552
+#: opie.c:64 pop3.c:560
 msgid "Secret pass phrase: "
 msgstr "��������� ����������������� �����:"
 
@@ -2264,7 +2269,7 @@ msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 "      --showdots    ����������� �������� ������ ��������� ���� � log-������\n"
 
-#: pop3.c:342
+#: pop3.c:343
 msgid ""
 "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
 "of TOP.\n"
@@ -2272,53 +2277,53 @@ msgstr ""
 "��������������: ������ POP3/PROXY-������ Maillennium; ������ TOP "
 "������������ ������� RETR.\n"
 
-#: pop3.c:590
+#: pop3.c:598
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "� ����������� �� ������� ��������� ��������� ����� APOP\n"
 
-#: pop3.c:599
+#: pop3.c:607
 msgid "Timestamp syntax error in greeting\n"
 msgstr "� ����������� ������ ���������� ��������� �����\n"
 
-#: pop3.c:621
+#: pop3.c:629
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "�������������� ������ ��������� � POP3_auth\n"
 
-#: pop3.c:629
+#: pop3.c:637
 msgid "lock busy!  Is another session active?\n"
 msgstr "���������� ���������!  ����� ������� ������ �����?\n"
 
-#: pop3.c:708
+#: pop3.c:716
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "���������� ���������� UIDL-����� upstream-�������.\n"
 
-#: pop3.c:731
+#: pop3.c:739
 msgid "Server responded with UID for wrong message.\n"
 msgstr "������ ��������� ����� � UID ��� ��������� ���������.\n"
 
-#: pop3.c:758 pop3.c:1004
+#: pop3.c:766 pop3.c:1012
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (�����=%d) ���� �������, �� ��� ��� ������������!\n"
 
-#: pop3.c:767 pop3.c:779 pop3.c:1013 pop3.c:1020
+#: pop3.c:775 pop3.c:787 pop3.c:1021 pop3.c:1028
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u �� �����������\n"
 
-#: pop3.c:864
+#: pop3.c:872
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr "��������� ��������� � ������ �� �������. ��������� ����������.\n"
 
-#: pop3.c:956
+#: pop3.c:964
 msgid "protocol error\n"
 msgstr "������ ���������\n"
 
-#: pop3.c:972
+#: pop3.c:980
 msgid "protocol error while fetching UIDLs\n"
 msgstr "������ ��������� ��� ������� UIDL'��\n"
 
-#: pop3.c:1342
+#: pop3.c:1350
 msgid "Option --folder is not supported with POP3\n"
 msgstr "����� --folder �� �������������� � POP3\n"
 
diff --git a/po/sq.po b/po/sq.po
index 439c92a5..ed7ae134 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.2.9-rc9\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2006-09-27 00:05+0200\n"
+"POT-Creation-Date: 2006-11-01 23:48+0100\n"
 "PO-Revision-Date: 2005-11-18 22:25+0200\n"
 "Last-Translator: Besnik Bleta <besnik@spymac.com>\n"
 "Language-Team: Albanian <translation-team-sq@lists.sourceforge.net>\n"
@@ -246,7 +246,7 @@ msgstr "Subjekt: Sinjalizim Fetchmail p�r sh�rbyes t� pakapsh�m."
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail-i nuk mundi t� lidhet me sh�rbyesin e post�s %s:"
 
-#: driver.c:1096 imap.c:423 pop3.c:465
+#: driver.c:1096
 msgid "SSL connection failed.\n"
 msgstr "Lidhja SSL d�shtoi.\n"
 
@@ -1689,77 +1689,82 @@ msgstr "Protokoll i identifikuar si IMAP2 ose IMAP2BIS\n"
 msgid "will idle after poll\n"
 msgstr "do t� rrij� bosh pas vjeljeje\n"
 
-#: imap.c:427 pop3.c:469
+#: imap.c:424 imap.c:447 pop3.c:466 pop3.c:489
+#, fuzzy
+msgid "TLS connection failed.\n"
+msgstr "Lidhja SSL d�shtoi.\n"
+
+#: imap.c:429 pop3.c:470
 #, c-format
 msgid "%s: opportunistic upgrade to TLS.\n"
 msgstr ""
 
-#: imap.c:540
+#: imap.c:547
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Aft�si e nevojshme OTP e pap�rpiluar tek fetchmail-i\n"
 
-#: imap.c:562 pop3.c:372
+#: imap.c:569 pop3.c:373
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Aft�si e nevojshme NTML e pap�rpiluar tek fetchmail-i\n"
 
-#: imap.c:571
+#: imap.c:578
 msgid "Required LOGIN capability not supported by server\n"
 msgstr "Aft�si e nevojshme LOGIN e pambuluar prej sh�rbyesit\n"
 
-#: imap.c:645
+#: imap.c:652
 #, fuzzy, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr ""
 "mesazhi %s@%s:%d nuk pat gjat�sin� e pritur (%d aktualja != %d e pritshmja)\n"
 
-#: imap.c:749 imap.c:808
+#: imap.c:756 imap.c:815
 msgid "re-poll failed\n"
 msgstr "rivjelja d�shtoi\n"
 
-#: imap.c:757 imap.c:813
+#: imap.c:764 imap.c:820
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "%d mesazh n� pritje pas rivjeljes\n"
 msgstr[1] "%d mesazhe n� pritje pas rivjeljes\n"
 
-#: imap.c:774
+#: imap.c:781
 msgid "mailbox selection failed\n"
 msgstr "p�rzgjedhja e kutis� postare d�shtoi\n"
 
-#: imap.c:778
+#: imap.c:785
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "%d mesazh n� pritje pas vjeljes s� par�\n"
 msgstr[1] "%d mesazhe n� pritje pas vjeljes s� par�\n"
 
-#: imap.c:792
+#: imap.c:799
 msgid "expunge failed\n"
 msgstr "shuarja d�shtoi\n"
 
-#: imap.c:796
+#: imap.c:803
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "%d mesazh n� pritje pas shuarjes\n"
 msgstr[1] "%d mesazhe n� pritje pas shuarjes\n"
 
-#: imap.c:838
+#: imap.c:845
 msgid "search for unseen messages failed\n"
 msgstr "k�rkimi p�r mesazhe t� pav�rejtur d�shtoi\n"
 
-#: imap.c:866
+#: imap.c:873
 #, fuzzy, c-format
 msgid "%lu is unseen\n"
 msgstr "%u �sht� i pav�rejtur\n"
 
-#: imap.c:878 pop3.c:788
+#: imap.c:885 pop3.c:796
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u �sht� i pari i pav�rejtur\n"
 
-#: imap.c:969
+#: imap.c:976
 msgid ""
 "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr ""
@@ -1955,7 +1960,7 @@ msgstr ""
 msgid "Could not decode OTP challenge\n"
 msgstr ""
 
-#: opie.c:64 pop3.c:552
+#: opie.c:64 pop3.c:560
 msgid "Secret pass phrase: "
 msgstr "Fraz� pass sekrete: "
 
@@ -2262,60 +2267,60 @@ msgstr "  -r, --folder      cakto em�r dosjeje t� larg�t\n"
 msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr "      --showdots    shfaq pika p�rparimi edhe n� kartela regjistrimi\n"
 
-#: pop3.c:342
+#: pop3.c:343
 msgid ""
 "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
 "of TOP.\n"
 msgstr ""
 
-#: pop3.c:590
+#: pop3.c:598
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Nuk u gjet vul� kohore e nevojshme APOP n� p�rsh�ndetje\n"
 
-#: pop3.c:599
+#: pop3.c:607
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Gabim sintakse vule kohore n� p�rsh�ndetje\n"
 
-#: pop3.c:621
+#: pop3.c:629
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr "K�rkes� protokolli e pap�rcaktuar n� POP3_auth\n"
 
-#: pop3.c:629
+#: pop3.c:637
 msgid "lock busy!  Is another session active?\n"
 msgstr ""
 
-#: pop3.c:708
+#: pop3.c:716
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr ""
 
-#: pop3.c:731
+#: pop3.c:739
 msgid "Server responded with UID for wrong message.\n"
 msgstr "Sh�rbyesi u p�rgjigj me UID p�r mesazh t� gabuar.\n"
 
-#: pop3.c:758 pop3.c:1004
+#: pop3.c:766 pop3.c:1012
 #, fuzzy, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (num=%d) qe fshir�, por �sht� ende i pranish�m!\n"
 
-#: pop3.c:767 pop3.c:779 pop3.c:1013 pop3.c:1020
+#: pop3.c:775 pop3.c:787 pop3.c:1021 pop3.c:1028
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u �sht� i pav�rejtur\n"
 
-#: pop3.c:864
+#: pop3.c:872
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr ""
 "Mesazhe t� futur n� nj� list� te sh�rbyesi. Nuk mund ta b�j dot k�t�.\n"
 
-#: pop3.c:956
+#: pop3.c:964
 msgid "protocol error\n"
 msgstr "gabim protokolli\n"
 
-#: pop3.c:972
+#: pop3.c:980
 msgid "protocol error while fetching UIDLs\n"
 msgstr "gabim protokolli gjat� sjelljes s� UIDL-ve\n"
 
-#: pop3.c:1342
+#: pop3.c:1350
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Mund�sia --dosje nuk mbulohet me POP3\n"
 
diff --git a/po/vi.po b/po/vi.po
index 4b373734..ad7cb6fc 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.5-b3\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2006-09-27 00:05+0200\n"
+"POT-Creation-Date: 2006-11-01 23:48+0100\n"
 "PO-Revision-Date: 2006-09-30 22:55+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -237,7 +237,7 @@ msgstr "Chủ đề : cảnh báo Fetchmail về máy phục vụ không tới �
 msgid "Fetchmail could not reach the mail server %s:"
 msgstr "Fetchmail không thể tới máy phục vụ thư %s:"
 
-#: driver.c:1096 imap.c:423 pop3.c:465
+#: driver.c:1096
 msgid "SSL connection failed.\n"
 msgstr "Kết nối SSL đã thất bại.\n"
 
@@ -1652,74 +1652,79 @@ msgstr "Giao thức được phát hiện là IMAP2 hay IMAP2BIS\n"
 msgid "will idle after poll\n"
 msgstr "sẽ nghỉ sau khi thăm dò\n"
 
-#: imap.c:427 pop3.c:469
+#: imap.c:424 imap.c:447 pop3.c:466 pop3.c:489
+#, fuzzy
+msgid "TLS connection failed.\n"
+msgstr "Kết nối SSL đã thất bại.\n"
+
+#: imap.c:429 pop3.c:470
 #, c-format
 msgid "%s: opportunistic upgrade to TLS.\n"
 msgstr "%s: nâng cấp lên TLS một cách cơ hội chủ nghĩa.\n"
 
-#: imap.c:540
+#: imap.c:547
 msgid "Required OTP capability not compiled into fetchmail\n"
 msgstr "Khả năng OTP cần thiết không được biên dịch vào fetchmail\n"
 
-#: imap.c:562 pop3.c:372
+#: imap.c:569 pop3.c:373
 msgid "Required NTLM capability not compiled into fetchmail\n"
 msgstr "Khả năng NTLM cần thiết không được biên dịch vào fetchmail\n"
 
-#: imap.c:571
+#: imap.c:578
 msgid "Required LOGIN capability not supported by server\n"
 msgstr ""
 "Khả năng LOGIN (đăng nhập) cần thiết không được hỗ trợ bởi máy phục vụ\n"
 
-#: imap.c:645
+#: imap.c:652
 #, c-format
 msgid "mail expunge mismatch (%d actual != %d expected)\n"
 msgstr "không khớp được khi xoá hẳn thư (%d thật != %d ngờ)\n"
 
-#: imap.c:749 imap.c:808
+#: imap.c:756 imap.c:815
 msgid "re-poll failed\n"
 msgstr "việc thăm dò lại bị lỗi\n"
 
-#: imap.c:757 imap.c:813
+#: imap.c:764 imap.c:820
 #, c-format
 msgid "%d message waiting after re-poll\n"
 msgid_plural "%d messages waiting after re-poll\n"
 msgstr[0] "%d thư đợi sau khi thăm dò lại\n"
 
-#: imap.c:774
+#: imap.c:781
 msgid "mailbox selection failed\n"
 msgstr "việc chọn hộp thư bị lỗi\n"
 
-#: imap.c:778
+#: imap.c:785
 #, c-format
 msgid "%d message waiting after first poll\n"
 msgid_plural "%d messages waiting after first poll\n"
 msgstr[0] "%d thư đợi sau khi thăm dò lần thứ nhất\n"
 
-#: imap.c:792
+#: imap.c:799
 msgid "expunge failed\n"
 msgstr "việc xoá hẳn bị lỗi\n"
 
-#: imap.c:796
+#: imap.c:803
 #, c-format
 msgid "%d message waiting after expunge\n"
 msgid_plural "%d messages waiting after expunge\n"
 msgstr[0] "%d thư đợi sau khi xoá hẳn\n"
 
-#: imap.c:838
+#: imap.c:845
 msgid "search for unseen messages failed\n"
 msgstr "việc tìm kiếm các thư chưa xem bị lỗi\n"
 
-#: imap.c:866
+#: imap.c:873
 #, c-format
 msgid "%lu is unseen\n"
 msgstr "%lu chưa xem\n"
 
-#: imap.c:878 pop3.c:788
+#: imap.c:885 pop3.c:796
 #, c-format
 msgid "%u is first unseen\n"
 msgstr "%u là thư đầu chưa xem\n"
 
-#: imap.c:969
+#: imap.c:976
 msgid ""
 "Warning: ignoring bogus data for message sizes returned by the server.\n"
 msgstr ""
@@ -1916,7 +1921,7 @@ msgstr "recv (nhận) của máy phục vụ là nghiêm trọng\n"
 msgid "Could not decode OTP challenge\n"
 msgstr "Không thể giải mã yêu cầu OTP\n"
 
-#: opie.c:64 pop3.c:552
+#: opie.c:64 pop3.c:560
 msgid "Secret pass phrase: "
 msgstr "Cụm từ mật khẩu bí mật: "
 
@@ -2240,7 +2245,7 @@ msgid "      --showdots    show progress dots even in logfiles\n"
 msgstr ""
 "      --showdots    _hiện các chấm_ tiến hành ngay cả trong tập tin ghi lưu\n"
 
-#: pop3.c:342
+#: pop3.c:343
 msgid ""
 "Warning: \"Maillennium POP3/PROXY server\" found, using RETR command instead "
 "of TOP.\n"
@@ -2248,56 +2253,56 @@ msgstr ""
 "Cảnh báo : tìm thấy « Maillennium POP3/PROXY server » nên dùng lệnh RETR "
 "thay vào TOP.\n"
 
-#: pop3.c:590
+#: pop3.c:598
 msgid "Required APOP timestamp not found in greeting\n"
 msgstr "Không tìm thấy nhãn thời gian APOP cần thiết trong lời chào mừng\n"
 
-#: pop3.c:599
+#: pop3.c:607
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Gặp lỗi cú pháp nhãn thời gian trong lời chào mừng\n"
 
-#: pop3.c:621
+#: pop3.c:629
 msgid "Undefined protocol request in POP3_auth\n"
 msgstr ""
 "Gặp yêu cầu giao thức không được xác định trong « POP3_auth » (xác thực)\n"
 
-#: pop3.c:629
+#: pop3.c:637
 msgid "lock busy!  Is another session active?\n"
 msgstr "khoá bận ! Có phiên chạy khác hoạt động không?\n"
 
-#: pop3.c:708
+#: pop3.c:716
 msgid "Cannot handle UIDL response from upstream server.\n"
 msgstr "Không thể xử lý đáp ứng UIDL từ máy phục vụ nguồn.\n"
 
-#: pop3.c:731
+#: pop3.c:739
 msgid "Server responded with UID for wrong message.\n"
 msgstr "Máy phục vụ đã đáp ứng UID cho thư không đúng.\n"
 
-#: pop3.c:758 pop3.c:1004
+#: pop3.c:766 pop3.c:1012
 #, c-format
 msgid "id=%s (num=%d) was deleted, but is still present!\n"
 msgstr "id=%s (số=%d) đã được xoá bỏ, nhưng còn có.\n"
 
-#: pop3.c:767 pop3.c:779 pop3.c:1013 pop3.c:1020
+#: pop3.c:775 pop3.c:787 pop3.c:1021 pop3.c:1028
 #, c-format
 msgid "%u is unseen\n"
 msgstr "%u chưa xem\n"
 
-#: pop3.c:864
+#: pop3.c:872
 msgid "Messages inserted into list on server. Cannot handle this.\n"
 msgstr ""
 "Gặp thư được chèn vào danh sách trên máy phục vụ. Không thể xử lý trường hợp "
 "này.\n"
 
-#: pop3.c:956
+#: pop3.c:964
 msgid "protocol error\n"
 msgstr "lỗi giao thức\n"
 
-#: pop3.c:972
+#: pop3.c:980
 msgid "protocol error while fetching UIDLs\n"
 msgstr "gặp lỗi giao thức khi lấy các UIDL\n"
 
-#: pop3.c:1342
+#: pop3.c:1350
 msgid "Option --folder is not supported with POP3\n"
 msgstr "Không hỗ trợ tùy chọn « --folder » (thư mục) với POP3\n"
 
diff --git a/pop2.c b/pop2.c
index b8dbb09f..8bfefb4c 100644
--- a/pop2.c
+++ b/pop2.c
@@ -17,6 +17,7 @@
 #endif
 #include  "fetchmail.h"
 #include  "socket.h"
+#include  "i18n.h"
 
 static int pound_arg, equal_arg;
 
@@ -60,6 +61,11 @@ static int pop2_getauth(int sock, struct query *ctl, char *buf)
     int status;
 
     (void)buf;
+    if (ctl->sslproto && !strcasecmp(ctl->sslproto, "tls1") && !ctl->use_ssl)
+    {
+	report(stderr, GT_("POP2 does not support STARTTLS. Giving up.\n"));
+	return PS_SOCKET;
+    }
     strlcpy(shroud, ctl->password, sizeof(shroud));
     status = gen_transact(sock,
 		  "HELO %s %s",
diff --git a/pop3.c b/pop3.c
index 0b201289..c38fbf67 100644
--- a/pop3.c
+++ b/pop3.c
@@ -303,6 +303,7 @@ static int pop3_getauth(int sock, struct query *ctl, char *greeting)
 #endif /* OPIE_ENABLE */
 #ifdef SSL_ENABLE
     flag did_stls = FALSE;
+    flag using_tls = FALSE;
 #endif /* SSL_ENABLE */
 
 #if defined(GSSAPI)
@@ -432,7 +433,7 @@ static int pop3_getauth(int sock, struct query *ctl, char *greeting)
 		    (ok == PS_SOCKET && !ctl->wehaveauthed))
 		{
 		    ctl->server.authenticate = A_PASSWORD;
-		    /* repoll immediately */
+		    /* repoll immediately with PASS authentication */
 		    ok = PS_REPOLL;
 		    break;
 		}
@@ -462,11 +463,12 @@ static int pop3_getauth(int sock, struct query *ctl, char *greeting)
 		   return PS_REPOLL;
 	       }
 	       report(stderr,
-		       GT_("SSL connection failed.\n"));
+		       GT_("TLS connection failed.\n"));
 	       return PS_SOCKET;
 	   } else {
 	       if (outlevel >= O_VERBOSE && !ctl->sslproto)
 		   report(stdout, GT_("%s: opportunistic upgrade to TLS.\n"), realhost);
+	       using_tls = TRUE;
 	   }
 	   did_stls = TRUE;
 
@@ -482,6 +484,12 @@ static int pop3_getauth(int sock, struct query *ctl, char *greeting)
 	    */
 	   capa_probe(sock);
 	}
+	if ((ctl->sslproto && !strcasecmp(ctl->sslproto,"tls1")) && !ctl->use_ssl && !using_tls) {
+	    report(stderr,
+		    GT_("TLS connection failed.\n"));
+	    return PS_SOCKET;
+	}
+
 #endif /* SSL_ENABLE */
 
 	/*
@@ -574,7 +582,7 @@ static int pop3_getauth(int sock, struct query *ctl, char *greeting)
 	if (did_stls && ok == PS_SOCKET && !ctl->sslproto && !ctl->wehaveauthed)
 	{
 	    ctl->sslproto = xstrdup("");
-	    /* repoll immediately */
+	    /* repoll immediately without TLS */
 	    ok = PS_REPOLL;
 	}
 #endif