Index: libmailwatch-core/mailwatch-mailbox-pop3.c =================================================================== --- libmailwatch-core/mailwatch-mailbox-pop3.c (revision 7237) +++ libmailwatch-core/mailwatch-mailbox-pop3.c (working copy) @@ -194,10 +194,9 @@ return FALSE; bin = pop3_recv_command(pmailbox, buf, BUFSIZE, TRUE); - if(bin < 0) - return FALSE; - if((p = strstr(buf, "SASL ")) && (q = strstr(p, "\n")) + //(bin < 0) means that server does not support CAPA command + if((bin >= 0) && (p = strstr(buf, "SASL ")) && (q = strstr(p, "\n")) && (p = strstr(p, "CRAM-MD5")) && p < q) { /* server supports CRAM-MD5 */