2008-08-28 [wwp] 3.5.0cvs81
[claws.git] / src / pop.c
index b2b5136136ff012e32f8a129a5cd30d32a69d8a6..968e951f4abc7000289e4075aed0f64fed836d2c 100644 (file)
--- a/src/pop.c
+++ b/src/pop.c
@@ -1,10 +1,10 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,8 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdarg.h>
 #include <ctype.h>
 #include <unistd.h>
+#include <time.h>
+#include <errno.h>
 
-#include "intl.h"
 #include "pop.h"
-#include "socket.h"
 #include "md5.h"
 #include "prefs_account.h"
 #include "utils.h"
-#include "inc.h"
 #include "recv.h"
-#include "selective_download.h"
-
-#define LOOKUP_NEXT_MSG() \
-       for (;;) { \
-               gint size = state->msg[state->cur_msg].size; \
-               gboolean size_limit_over = \
-                   (state->ac_prefs->enable_size_limit && \
-                    state->ac_prefs->size_limit > 0 && \
-                    size > state->ac_prefs->size_limit * 1024); \
- \
-               if (size_limit_over) \
-                       log_print(_("POP3: Skipping message %d (%d bytes)\n"), \
-                                 state->cur_msg, size); \
- \
-               if (size == 0 || state->msg[state->cur_msg].received || \
-                   size_limit_over) { \
-                       if (size > 0) \
-                               state->cur_total_bytes += size; \
-                       if (state->cur_msg == state->count) \
-                               return POP3_LOGOUT_SEND; \
-                       else \
-                               state->cur_msg++; \
-               } else \
-                       break; \
-       }
-
-static gint pop3_ok(SockInfo *sock, gchar *argbuf);
-static void pop3_gen_send(SockInfo *sock, const gchar *format, ...);
-static gint pop3_gen_recv(SockInfo *sock, gchar *buf, gint size);
-static gboolean pop3_delete_header (Pop3State *state);
-static gboolean should_delete (const char *uidl, gpointer data); 
-
-gint pop3_greeting_recv(SockInfo *sock, gpointer data)
+#include "partial_download.h"
+#include "log.h"
+#include "hooks.h"
+
+static gint pop3_greeting_recv         (Pop3Session *session,
+                                        const gchar *msg);
+static gint pop3_getauth_user_send     (Pop3Session *session);
+static gint pop3_getauth_pass_send     (Pop3Session *session);
+static gint pop3_getauth_apop_send     (Pop3Session *session);
+#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+static gint pop3_stls_send             (Pop3Session *session);
+static gint pop3_stls_recv             (Pop3Session *session);
+#endif
+static gint pop3_getrange_stat_send    (Pop3Session *session);
+static gint pop3_getrange_stat_recv    (Pop3Session *session,
+                                        const gchar *msg);
+static gint pop3_getrange_last_send    (Pop3Session *session);
+static gint pop3_getrange_last_recv    (Pop3Session *session,
+                                        const gchar *msg);
+static gint pop3_getrange_uidl_send    (Pop3Session *session);
+static gint pop3_getrange_uidl_recv    (Pop3Session *session,
+                                        const gchar *data,
+                                        guint        len);
+static gint pop3_getsize_list_send     (Pop3Session *session);
+static gint pop3_getsize_list_recv     (Pop3Session *session,
+                                        const gchar *data,
+                                        guint        len);
+static gint pop3_retr_send             (Pop3Session *session);
+static gint pop3_retr_recv             (Pop3Session *session,
+                                        const gchar *data,
+                                        guint        len);
+static gint pop3_delete_send           (Pop3Session *session);
+static gint pop3_delete_recv           (Pop3Session *session);
+static gint pop3_logout_send           (Pop3Session *session);
+
+static void pop3_gen_send              (Pop3Session    *session,
+                                        const gchar    *format, ...);
+
+static void pop3_session_destroy       (Session        *session);
+
+static gint pop3_write_msg_to_file     (const gchar    *file,
+                                        const gchar    *data,
+                                        guint           len,
+                                        const gchar    *prefix);
+
+static Pop3State pop3_lookup_next      (Pop3Session    *session);
+static Pop3ErrorValue pop3_ok          (Pop3Session    *session,
+                                        const gchar    *msg);
+
+static gint pop3_session_recv_msg              (Session        *session,
+                                                const gchar    *msg);
+static gint pop3_session_recv_data_finished    (Session        *session,
+                                                guchar         *data,
+                                                guint           len);
+static void pop3_get_uidl_table(PrefsAccount *ac_prefs, Pop3Session *session);
+
+static gint pop3_greeting_recv(Pop3Session *session, const gchar *msg)
 {
-       Pop3State *state = (Pop3State *)data;
-       gchar buf[POPBUFSIZE];
+       session->state = POP3_GREETING;
 
-       if (pop3_ok(sock, buf) == PS_SUCCESS) {
-               if (state->ac_prefs->protocol == A_APOP) {
-                       state->greeting = g_strdup(buf);
-                       return POP3_GETAUTH_APOP_SEND;
-               } else
-                       return POP3_GETAUTH_USER_SEND;
-       } else
-               return -1;
+       session->greeting = g_strdup(msg);
+       return PS_SUCCESS;
 }
 
-gint pop3_getauth_user_send(SockInfo *sock, gpointer data)
+#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+static gint pop3_stls_send(Pop3Session *session)
 {
-       Pop3State *state = (Pop3State *)data;
-
-       g_return_val_if_fail(state->user != NULL, -1);
-
-       inc_progress_update(state, POP3_GETAUTH_USER_SEND);
-
-       pop3_gen_send(sock, "USER %s", state->user);
-
-       return POP3_GETAUTH_USER_RECV;
+       session->state = POP3_STLS;
+       pop3_gen_send(session, "STLS");
+       return PS_SUCCESS;
 }
 
-gint pop3_getauth_user_recv(SockInfo *sock, gpointer data)
+static gint pop3_stls_recv(Pop3Session *session)
 {
-       Pop3State *state = (Pop3State *)data;
-
-       if (pop3_ok(sock, NULL) == PS_SUCCESS)
-               return POP3_GETAUTH_PASS_SEND;
-       else {
-               log_warning(_("error occurred on authentication\n"));
-               state->error_val = PS_AUTHFAIL;
-               state->inc_state = INC_AUTH_FAILED;
+       if (session_start_tls(SESSION(session)) < 0) {
+               session->error_val = PS_SOCKET;
                return -1;
        }
+       return PS_SUCCESS;
 }
+#endif /* USE_OPENSSL */
 
-gint pop3_getauth_pass_send(SockInfo *sock, gpointer data)
+static gint pop3_getauth_user_send(Pop3Session *session)
 {
-       Pop3State *state = (Pop3State *)data;
-
-       g_return_val_if_fail(state->pass != NULL, -1);
+       g_return_val_if_fail(session->user != NULL, -1);
 
-       pop3_gen_send(sock, "PASS %s", state->pass);
-
-       return POP3_GETAUTH_PASS_RECV;
+       session->state = POP3_GETAUTH_USER;
+       pop3_gen_send(session, "USER %s", session->user);
+       return PS_SUCCESS;
 }
 
-gint pop3_getauth_pass_recv(SockInfo *sock, gpointer data)
+static gint pop3_getauth_pass_send(Pop3Session *session)
 {
-       Pop3State *state = (Pop3State *)data;
+       g_return_val_if_fail(session->pass != NULL, -1);
 
-       if (pop3_ok(sock, NULL) == PS_SUCCESS) {
-               
-               if (pop3_delete_header(state) == TRUE)
-                       return POP3_DELETE_SEND;
-               else
-                       return POP3_GETRANGE_STAT_SEND;
-       }
-       else {
-               log_warning(_("error occurred on authentication\n"));
-               state->error_val = PS_AUTHFAIL;
-               state->inc_state = INC_AUTH_FAILED;
-               return -1;
-       }
+       session->state = POP3_GETAUTH_PASS;
+       pop3_gen_send(session, "PASS %s", session->pass);
+       return PS_SUCCESS;
 }
 
-gint pop3_getauth_apop_send(SockInfo *sock, gpointer data)
+static gint pop3_getauth_apop_send(Pop3Session *session)
 {
-       Pop3State *state = (Pop3State *)data;
        gchar *start, *end;
        gchar *apop_str;
        gchar md5sum[33];
 
-       g_return_val_if_fail(state->user != NULL, -1);
-       g_return_val_if_fail(state->pass != NULL, -1);
+       g_return_val_if_fail(session->user != NULL, -1);
+       g_return_val_if_fail(session->pass != NULL, -1);
 
-       inc_progress_update(state, POP3_GETAUTH_APOP_SEND);
+       session->state = POP3_GETAUTH_APOP;
 
-       if ((start = strchr(state->greeting, '<')) == NULL) {
-               log_warning(_("Required APOP timestamp not found "
-                             "in greeting\n"));
+       if ((start = strchr(session->greeting, '<')) == NULL) {
+               log_error(LOG_PROTOCOL, _("Required APOP timestamp not found "
+                           "in greeting\n"));
+               session->error_val = PS_PROTOCOL;
                return -1;
        }
 
        if ((end = strchr(start, '>')) == NULL || end == start + 1) {
-               log_warning(_("Timestamp syntax error in greeting\n"));
+               log_error(LOG_PROTOCOL, _("Timestamp syntax error in greeting\n"));
+               session->error_val = PS_PROTOCOL;
                return -1;
        }
-
        *(end + 1) = '\0';
 
-       apop_str = g_strconcat(start, state->pass, NULL);
+       if (!is_ascii_str(start)) {
+               log_error(LOG_PROTOCOL, _("Timestamp syntax error in greeting (not ASCII)\n"));
+               session->error_val = PS_PROTOCOL;
+               return -1;
+       }
+
+       apop_str = g_strconcat(start, session->pass, NULL);
        md5_hex_digest(md5sum, apop_str);
        g_free(apop_str);
 
-       pop3_gen_send(sock, "APOP %s %s", state->user, md5sum);
+       pop3_gen_send(session, "APOP %s %s", session->user, md5sum);
 
-       return POP3_GETAUTH_APOP_RECV;
+       return PS_SUCCESS;
 }
 
-gint pop3_getauth_apop_recv(SockInfo *sock, gpointer data)
+static gint pop3_getrange_stat_send(Pop3Session *session)
 {
-       Pop3State *state = (Pop3State *)data;
-
-       if (pop3_ok(sock, NULL) == PS_SUCCESS) {
-               
-               if (pop3_delete_header(state) == TRUE)
-                       return POP3_DELETE_SEND;
-               else
-               return POP3_GETRANGE_STAT_SEND;
-       }
+       session->state = POP3_GETRANGE_STAT;
+       pop3_gen_send(session, "STAT");
+       return PS_SUCCESS;
+}
 
-       else {
-               log_warning(_("error occurred on authentication\n"));
-               state->error_val = PS_AUTHFAIL;
-               state->inc_state = INC_AUTH_FAILED;
+static gint pop3_getrange_stat_recv(Pop3Session *session, const gchar *msg)
+{
+       if (sscanf(msg, "%d %d", &session->count, &session->total_bytes) != 2) {
+               log_error(LOG_PROTOCOL, _("POP3 protocol error\n"));
+               session->error_val = PS_PROTOCOL;
                return -1;
+       } else {
+               if (session->count == 0) {
+                       session->uidl_is_valid = TRUE;
+               } else {
+                       session->msg = g_new0(Pop3MsgInfo, session->count + 1);
+                       session->cur_msg = 1;
+               }
        }
+
+       return PS_SUCCESS;
 }
 
-gint pop3_getrange_stat_send(SockInfo *sock, gpointer data)
+static gint pop3_getrange_last_send(Pop3Session *session)
 {
-       Pop3State *state = (Pop3State *)data;
-
-       inc_progress_update(state, POP3_GETRANGE_STAT_SEND);
-
-       pop3_gen_send(sock, "STAT");
-
-       return POP3_GETRANGE_STAT_RECV;
+       session->state = POP3_GETRANGE_LAST;
+       pop3_gen_send(session, "LAST");
+       return PS_SUCCESS;
 }
 
-gint pop3_getrange_stat_recv(SockInfo *sock, gpointer data)
+static gint pop3_getrange_last_recv(Pop3Session *session, const gchar *msg)
 {
-       Pop3State *state = (Pop3State *)data;
-       gchar buf[POPBUFSIZE + 1];
-       gint ok;
+       gint last;
 
-       if ((ok = pop3_ok(sock, buf)) == PS_SUCCESS) {
-               if (sscanf(buf, "%d %d", &state->count, &state->total_bytes)
-                   != 2) {
-                       log_warning(_("POP3 protocol error\n"));
-                       return -1;
-               } else {
-                       if (state->count == 0) {
-                               state->uidl_is_valid = TRUE;
-                               return POP3_LOGOUT_SEND;
-                       } else {
-                               state->msg = g_new0
-                                       (Pop3MsgInfo, state->count + 1);
-                               state->cur_msg = 1;
-                               return POP3_GETRANGE_UIDL_SEND;
-                       }
-               }
-       } else if (ok == PS_PROTOCOL)
-               return POP3_LOGOUT_SEND;
-       else
+       if (sscanf(msg, "%d", &last) == 0) {
+               log_warning(LOG_PROTOCOL, _("POP3 protocol error\n"));
+               session->error_val = PS_PROTOCOL;
                return -1;
+       } else {
+               if (session->count > last) {
+                       session->new_msg_exist = TRUE;
+                       session->cur_msg = last + 1;
+               } else
+                       session->cur_msg = 0;
+       }
+
+       return PS_SUCCESS;
 }
 
-gint pop3_getrange_last_send(SockInfo *sock, gpointer data)
+static gint pop3_getrange_uidl_send(Pop3Session *session)
 {
-       Pop3State *state = (Pop3State *)data;
+       session->state = POP3_GETRANGE_UIDL;
+       pop3_gen_send(session, "UIDL");
+       return PS_SUCCESS;
+}
 
-       inc_progress_update(state, POP3_GETRANGE_LAST_SEND);
+static gint pop3_getrange_uidl_recv(Pop3Session *session, const gchar *data,
+                                   guint len)
+{
+       gchar id[IDLEN + 1];
+       gchar buf[POPBUFSIZE];
+       gint buf_len;
+       guint32 num;
+       time_t recv_time;
+       gint partial_recv;
+       const gchar *p = data;
+       const gchar *lastp = data + len;
+       const gchar *newline;
+
+       while (p < lastp) {
+               if ((newline = memchr(p, '\r', lastp - p)) == NULL)
+                       return -1;
+               buf_len = MIN(newline - p, sizeof(buf) - 1);
+               memcpy(buf, p, buf_len);
+               buf[buf_len] = '\0';
 
-       pop3_gen_send(sock, "LAST");
+               p = newline + 1;
+               if (p < lastp && *p == '\n') p++;
 
-       return POP3_GETRANGE_LAST_RECV;
-}
+               if (sscanf(buf, "%d %" Xstr(IDLEN) "s", &num, id) != 2 ||
+                   num <= 0 || num > session->count) {
+                       log_warning(LOG_PROTOCOL, _("invalid UIDL response: %s\n"), buf);
+                       continue;
+               }
 
-gint pop3_getrange_last_recv(SockInfo *sock, gpointer data)
-{
-       Pop3State *state = (Pop3State *)data;
-       gchar buf[POPBUFSIZE + 1];
+               session->msg[num].uidl = g_strdup(id);
 
-       if (pop3_ok(sock, buf) == PS_SUCCESS) {
-               gint last;
+               recv_time = (time_t)(GPOINTER_TO_INT(g_hash_table_lookup(
+                                       session->uidl_table, id)));
+               session->msg[num].recv_time = recv_time;
 
-               if (sscanf(buf, "%d", &last) == 0) {
-                       log_warning(_("POP3 protocol error\n"));
-                       return -1;
+               if (recv_time != RECV_TIME_NONE) {
+                       debug_print("num %d uidl %s: already got it\n", num, id);               
                } else {
-                       if (state->count == last)
-                               return POP3_LOGOUT_SEND;
-                       else {
-                               state->cur_msg = last + 1;
-                               return POP3_GETSIZE_LIST_SEND;
-                       }
+                       debug_print("num %d uidl %s: unknown\n", num, id);
                }
-       } else
-               return POP3_GETSIZE_LIST_SEND;
-}
 
-gint pop3_getrange_uidl_send(SockInfo *sock, gpointer data)
-{
-       Pop3State *state = (Pop3State *)data;
+               partial_recv = (gint)(GPOINTER_TO_INT(g_hash_table_lookup(
+                                       session->partial_recv_table, id)));
 
-       inc_progress_update(state, POP3_GETRANGE_UIDL_SEND);
+               if (recv_time != RECV_TIME_NONE
+               || partial_recv != POP3_TOTALLY_RECEIVED) {
+                       session->msg[num].received = 
+                               (partial_recv != POP3_MUST_COMPLETE_RECV);
+                       session->msg[num].partial_recv = partial_recv;
+                       if (partial_recv == POP3_MUST_COMPLETE_RECV)
+                               session->new_msg_exist = TRUE;
+               }
+               if (!session->new_msg_exist &&
+                   (recv_time == RECV_TIME_NONE ||
+                    session->ac_prefs->rmmail)) {
+                       session->cur_msg = num;
+                       session->new_msg_exist = TRUE;
+               }
+       }
 
-       pop3_gen_send(sock, "UIDL");
+       session->uidl_is_valid = TRUE;
+       return PS_SUCCESS;
+}
 
-       return POP3_GETRANGE_UIDL_RECV;
+static gint pop3_getsize_list_send(Pop3Session *session)
+{
+       session->state = POP3_GETSIZE_LIST;
+       pop3_gen_send(session, "LIST");
+       return PS_SUCCESS;
 }
 
-gint pop3_getrange_uidl_recv(SockInfo *sock, gpointer data)
+static gint pop3_getsize_list_recv(Pop3Session *session, const gchar *data,
+                                  guint len)
 {
-       Pop3State *state = (Pop3State *)data;
-       gboolean new = FALSE;
-       gboolean get_all = FALSE;
        gchar buf[POPBUFSIZE];
-       gchar id[IDLEN + 1];
-
-       if (pop3_ok(sock, NULL) != PS_SUCCESS) return POP3_GETRANGE_LAST_SEND;
-
-       if (!state->uidl_table) new = TRUE;
-       if (state->ac_prefs->getall)
-               get_all = TRUE;
+       gint buf_len;
+       guint num, size;
+       const gchar *p = data;
+       const gchar *lastp = data + len;
+       const gchar *newline;
+
+       while (p < lastp) {
+               if ((newline = memchr(p, '\r', lastp - p)) == NULL)
+                       return -1;
+               buf_len = MIN(newline - p, sizeof(buf) - 1);
+               memcpy(buf, p, buf_len);
+               buf[buf_len] = '\0';
 
-       while (sock_gets(sock, buf, sizeof(buf)) >= 0) {
-               gint num;
+               p = newline + 1;
+               if (p < lastp && *p == '\n') p++;
 
-               if (buf[0] == '.') break;
-               if (sscanf(buf, "%d %" Xstr(IDLEN) "s", &num, id) != 2)
-                       continue;
-               if (num <= 0 || num > state->count) continue;
-
-               state->msg[num].uidl = g_strdup(id);
-
-               if (state->uidl_table) {
-                       if (!get_all &&
-                           g_hash_table_lookup(state->uidl_table, id) != NULL)
-                               state->msg[num].received = TRUE;
-                       else {
-                               if (new == FALSE) {
-                                       state->cur_msg = num;
-                                       new = TRUE;
-                               }
-                       }
+               if (sscanf(buf, "%u %u", &num, &size) != 2) {
+                       session->error_val = PS_PROTOCOL;
+                       return -1;
                }
 
-               if (should_delete(buf, (Pop3State *) state))
-                       state->uidl_todelete_list = g_slist_append
-                                       (state->uidl_todelete_list, g_strdup(buf));             
-               
+               if (num > 0 && num <= session->count)
+                       session->msg[num].size = size;
+               if (num > 0 && num < session->cur_msg)
+                       session->cur_total_bytes += size;
        }
 
-       state->uidl_is_valid = TRUE;
+       return PS_SUCCESS;
+}
 
-       if (new == TRUE)
-               return POP3_GETSIZE_LIST_SEND;
-       else
-               return POP3_LOGOUT_SEND;
+static gint pop3_retr_send(Pop3Session *session)
+{
+       session->state = POP3_RETR;
+       debug_print("retrieving %d [%s]\n", session->cur_msg, 
+               session->msg[session->cur_msg].uidl ?
+                session->msg[session->cur_msg].uidl:" ");
+       pop3_gen_send(session, "RETR %d", session->cur_msg);
+       return PS_SUCCESS;
 }
 
-static gboolean should_delete(const char *uidl, gpointer data) 
+static gint pop3_retr_recv(Pop3Session *session, const gchar *data, guint len)
 {
-       /* answer[0] will contain id
-        * answer[0] will contain uidl */
-       Pop3State *state = (Pop3State *) data;
-       gchar **answer;
-       int  id;
-       gboolean result;
-       int tdate, keep_for, today, nb_days;
-       const gchar *sdate;
-       GDate curdate;
-       gchar *tuidl;
-
-       if (!state->ac_prefs->rmmail || !strchr(uidl, ' '))
-               return FALSE;
-
-       /* remove \r\n */
-       tuidl  = g_strndup(uidl, strlen(uidl) - 2);
-       answer = g_strsplit(tuidl, " ", 2);
-       id     = atoi(answer[0]);
-
-       if (NULL != (sdate = g_hash_table_lookup(state->uidl_table, answer[1]))) {
-               tdate    = atoi(sdate);
-               keep_for = atoi(state->ac_prefs->leave_time); /* FIXME: leave time should be an int */
-
-               g_date_clear(&curdate, 1);
-               g_date_set_time(&curdate, time(NULL));
-               today = g_date_day_of_year(&curdate);
+       gchar *file;
+       gint drop_ok;
+       MailReceiveData mail_receive_data;
+
+       /* NOTE: we allocate a slightly larger buffer with a zero terminator
+        * because some plugins may think that it has a C string. */ 
+       mail_receive_data.session  = session;
+       mail_receive_data.data     = g_new0(gchar, len + 1);
+       mail_receive_data.data_len = len;
+       memcpy(mail_receive_data.data, data, len); 
+       
+       hooks_invoke(MAIL_RECEIVE_HOOKLIST, &mail_receive_data);
+
+       file = get_tmp_file();
+       if (pop3_write_msg_to_file(file, mail_receive_data.data, 
+                                  mail_receive_data.data_len, NULL) < 0) {
+               g_free(file);
+               g_free(mail_receive_data.data);
+               session->error_val = PS_IOERR;
+               return -1;
+       }
+       g_free(mail_receive_data.data);
+
+       if (session->msg[session->cur_msg].partial_recv 
+           == POP3_MUST_COMPLETE_RECV) {
+               gchar *old_file = partial_get_filename(
+                               session->ac_prefs->recv_server,
+                               session->ac_prefs->userid,
+                               session->msg[session->cur_msg].uidl);
                
-               nb_days = g_date_is_leap_year(g_date_year(&curdate)) ? 366 : 365;
-               result  = ((tdate + keep_for) % nb_days <= today);
-       } else
-               result = FALSE;
+               if (old_file) {
+                       partial_delete_old(old_file);
+                       g_free(old_file);
+               }
+       } 
+
+       /* drop_ok: 0: success 1: don't receive -1: error */
+       drop_ok = session->drop_message(session, file);
 
-       g_free(tuidl);
-       g_strfreev(answer);
+       g_free(file);
+       if (drop_ok < 0) {
+               session->error_val = PS_IOERR;
+               return -1;
+       }
        
-       return result;
-}
+       session->cur_total_bytes += session->msg[session->cur_msg].size;
+       session->cur_total_recv_bytes += session->msg[session->cur_msg].size;
+       session->cur_total_num++;
 
-gint pop3_getsize_list_send(SockInfo *sock, gpointer data)
-{
-       Pop3State *state = (Pop3State *)data;
+       session->msg[session->cur_msg].received = TRUE;
+       session->msg[session->cur_msg].partial_recv = POP3_TOTALLY_RECEIVED;
 
-       inc_progress_update(state, POP3_GETSIZE_LIST_SEND);
+       session->msg[session->cur_msg].recv_time =
+               drop_ok == 1 ? RECV_TIME_KEEP : session->current_time;
 
-       pop3_gen_send(sock, "LIST");
+       return PS_SUCCESS;
+}
 
-       return POP3_GETSIZE_LIST_RECV;
+static gint pop3_top_send(Pop3Session *session, gint max_size)
+{
+       gint num_lines = (max_size*1024)/82; /* consider lines to be 80 chars */
+       session->state = POP3_TOP;
+       pop3_gen_send(session, "TOP %d %d", session->cur_msg, num_lines);
+       return PS_SUCCESS;
 }
 
-gint pop3_getsize_list_recv(SockInfo *sock, gpointer data)
+static gint pop3_top_recv(Pop3Session *session, const gchar *data, guint len)
 {
-       Pop3State *state = (Pop3State *)data;
-       gchar buf[POPBUFSIZE];
+       gchar *file;
+       gint drop_ok;
+       MailReceiveData mail_receive_data;
+       gchar *partial_notice = NULL;
+       
+       /* NOTE: we allocate a slightly larger buffer with a zero terminator
+        * because some plugins may think that it has a C string. */ 
+       mail_receive_data.session  = session;
+       mail_receive_data.data     = g_new0(gchar, len + 1);
+       mail_receive_data.data_len = len;
+       memcpy(mail_receive_data.data, data, len);
+       
+       hooks_invoke(MAIL_RECEIVE_HOOKLIST, &mail_receive_data);
+
+       partial_notice = g_strdup_printf("SC-Marked-For-Download: 0\n"
+                                        "SC-Partially-Retrieved: %s\n"
+                                        "SC-Account-Server: %s\n"
+                                        "SC-Account-Login: %s\n"
+                                        "SC-Message-Size: %d",
+                                        session->msg[session->cur_msg].uidl,
+                                        session->ac_prefs->recv_server,
+                                        session->ac_prefs->userid,
+                                        session->msg[session->cur_msg].size);
+       file = get_tmp_file();
+       if (pop3_write_msg_to_file(file, mail_receive_data.data,
+                                  mail_receive_data.data_len,  
+                                  partial_notice) < 0) {
+               g_free(file);
+               g_free(mail_receive_data.data);
+               session->error_val = PS_IOERR;
+               g_free(partial_notice);
+               return -1;
+       }
+       g_free(mail_receive_data.data);
+       g_free(partial_notice);
+
+       /* drop_ok: 0: success 1: don't receive -1: error */
+       drop_ok = session->drop_message(session, file);
+       g_free(file);
+       if (drop_ok < 0) {
+               session->error_val = PS_IOERR;
+               return -1;
+       }
 
-       if (pop3_ok(sock, NULL) != PS_SUCCESS) return POP3_LOGOUT_SEND;
+       session->cur_total_bytes += session->msg[session->cur_msg].size;
+       session->cur_total_recv_bytes += session->msg[session->cur_msg].size;
+       session->cur_total_num++;
 
-       state->cur_total_bytes = 0;
+       session->msg[session->cur_msg].received = TRUE;
+       session->msg[session->cur_msg].partial_recv = POP3_PARTIALLY_RECEIVED;
+       session->msg[session->cur_msg].recv_time =
+               drop_ok == 1 ? RECV_TIME_KEEP : session->current_time;
 
-       while (sock_gets(sock, buf, sizeof(buf)) >= 0) {
-               guint num, size;
+       return PS_SUCCESS;
+}
 
-               if (buf[0] == '.') break;
-               if (sscanf(buf, "%u %u", &num, &size) != 2)
-                       return -1;
+static gint pop3_delete_send(Pop3Session *session)
+{
+       session->state = POP3_DELETE;
+       pop3_gen_send(session, "DELE %d", session->cur_msg);
+       return PS_SUCCESS;
+}
 
-               if (num > 0 && num <= state->count)
-                       state->msg[num].size = size;
-               if (num > 0 && num < state->cur_msg)
-                       state->cur_total_bytes += size;
-       }
+static gint pop3_delete_recv(Pop3Session *session)
+{
+       session->msg[session->cur_msg].deleted = TRUE;
+       return PS_SUCCESS;
+}
 
-       LOOKUP_NEXT_MSG();
-       if (state->ac_prefs->session_type == RETR_HEADER) 
-               return POP3_TOP_SEND;
-       else
-               return POP3_RETR_SEND;
- }
-gint pop3_top_send(SockInfo *sock, gpointer data)
+static gint pop3_logout_send(Pop3Session *session)
+{
+       session->state = POP3_LOGOUT;
+       pop3_gen_send(session, "QUIT");
+       return PS_SUCCESS;
+}
+
+static void pop3_gen_send(Pop3Session *session, const gchar *format, ...)
 {
-       Pop3State *state = (Pop3State *)data;
+       gchar buf[POPBUFSIZE + 1];
+       va_list args;
 
-       inc_progress_update(state, POP3_TOP_SEND); 
+       va_start(args, format);
+       g_vsnprintf(buf, sizeof(buf) - 2, format, args);
+       va_end(args);
 
-       pop3_gen_send(sock, "TOP %i 0", state->cur_msg );
+       if (!g_ascii_strncasecmp(buf, "PASS ", 5))
+               log_print(LOG_PROTOCOL, "POP3> PASS ********\n");
+       else
+               log_print(LOG_PROTOCOL, "POP3> %s\n", buf);
 
-       return POP3_TOP_RECV;
+       session_send_msg(SESSION(session), SESSION_MSG_NORMAL, buf);
 }
 
-gint pop3_top_recv(SockInfo *sock, gpointer data)
+Session *pop3_session_new(PrefsAccount *account)
 {
-       Pop3State *state = (Pop3State *)data;
-       FILE  *fp;
-       gchar buf[POPBUFSIZE];
-       gchar *header;
-       gchar *filename, *path;
-       
-       inc_progress_update(state, POP3_TOP_RECV); 
+       Pop3Session *session;
 
-       if (pop3_ok(sock, NULL) != PS_SUCCESS) 
-               return POP3_LOGOUT_SEND;
+       g_return_val_if_fail(account != NULL, NULL);
 
-       path = g_strconcat(get_header_cache_dir(), G_DIR_SEPARATOR_S, NULL);
+       session = g_new0(Pop3Session, 1);
 
-       if ( !is_dir_exist(path) )
-               make_dir_hier(path);
-       
-       filename = g_strdup_printf("%s%i", path, state->cur_msg);
-                                  
-       if (recv_write_to_file(sock, filename) < 0) {
-               state->inc_state = INC_NOSPACE;
-               return -1;
-       }
-       /* we add a Complete-Size Header Item ...
-          note: overwrites first line  --> this is dirty */
-       if ( (fp = fopen(filename, "rb+")) != NULL ) {
-               gchar *buf = g_strdup_printf("%s%i", SIZE_HEADER, 
-                                            state->msg[state->cur_msg].size);
-       
-               if (change_file_mode_rw(fp, filename) == 0) 
-                       fprintf(fp, "%s\n", buf);
-               g_free(buf);    
-               fclose(fp);
-       }
-       
-       g_free(path);
-       g_free(filename);
+       session_init(SESSION(session), account, FALSE);
 
-       if (state->cur_msg < state->count) {
-               state->cur_msg++;
-               return POP3_TOP_SEND;
-       } else
-               return POP3_LOGOUT_SEND;
+       SESSION(session)->type = SESSION_POP3;
+
+       SESSION(session)->recv_msg = pop3_session_recv_msg;
+       SESSION(session)->recv_data_finished = pop3_session_recv_data_finished;
+       SESSION(session)->send_data_finished = NULL;
+
+       SESSION(session)->destroy = pop3_session_destroy;
+
+       session->state = POP3_READY;
+       session->ac_prefs = account;
+       session->pop_before_smtp = FALSE;
+       pop3_get_uidl_table(account, session);
+       session->current_time = time(NULL);
+       session->error_val = PS_SUCCESS;
+       session->error_msg = NULL;
+
+       return SESSION(session);
 }
 
-gint pop3_retr_send(SockInfo *sock, gpointer data)
+static void pop3_session_destroy(Session *session)
 {
-       Pop3State *state = (Pop3State *)data;
+       Pop3Session *pop3_session = POP3_SESSION(session);
+       gint n;
+
+       g_return_if_fail(session != NULL);
 
-       inc_progress_update(state, POP3_RETR_SEND);
+       for (n = 1; n <= pop3_session->count; n++)
+               g_free(pop3_session->msg[n].uidl);
+       g_free(pop3_session->msg);
 
-       pop3_gen_send(sock, "RETR %d", state->cur_msg);
+       if (pop3_session->uidl_table) {
+               hash_free_strings(pop3_session->uidl_table);
+               g_hash_table_destroy(pop3_session->uidl_table);
+       }
+
+       if (pop3_session->partial_recv_table) {
+               hash_free_strings(pop3_session->partial_recv_table);
+               g_hash_table_destroy(pop3_session->partial_recv_table);
+       }
 
-       return POP3_RETR_RECV;
+       g_free(pop3_session->greeting);
+       g_free(pop3_session->user);
+       g_free(pop3_session->pass);
+       g_free(pop3_session->error_msg);
 }
 
-gint pop3_retr_recv(SockInfo *sock, gpointer data)
+static void pop3_get_uidl_table(PrefsAccount *ac_prefs, Pop3Session *session)
 {
-       Pop3State *state = (Pop3State *)data;
-       const gchar *file;
-       gint ok, drop_ok;
-       int keep_for;
+       GHashTable *table;
+       GHashTable *partial_recv_table;
+       gchar *path;
+       FILE *fp;
+       gchar buf[POPBUFSIZE];
+       gchar uidl[POPBUFSIZE];
+       time_t recv_time;
+       time_t now;
+       gint partial_recv;
+       gchar *sanitized_uid = g_strdup(ac_prefs->userid);
        
-       if ((ok = pop3_ok(sock, NULL)) == PS_SUCCESS) {
-               if (recv_write_to_file(sock, (file = get_tmp_file())) < 0) {
-                       if (state->inc_state == INC_SUCCESS)
-                               state->inc_state = INC_NOSPACE;
-                       return -1;
+       subst_for_filename(sanitized_uid);
+       
+       table = g_hash_table_new(g_str_hash, g_str_equal);
+       partial_recv_table = g_hash_table_new(g_str_hash, g_str_equal);
+
+       path = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
+                          "uidl", G_DIR_SEPARATOR_S, ac_prefs->recv_server,
+                          "-", sanitized_uid, NULL);
+                          
+       g_free(sanitized_uid);
+       if ((fp = g_fopen(path, "rb")) == NULL) {
+               if (ENOENT != errno) FILE_OP_ERROR(path, "fopen");
+               g_free(path);
+               path = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
+                                  "uidl-", ac_prefs->recv_server,
+                                  "-", ac_prefs->userid, NULL);
+               if ((fp = g_fopen(path, "rb")) == NULL) {
+                       if (ENOENT != errno) FILE_OP_ERROR(path, "fopen");
+                       g_free(path);
+                       session->uidl_table = table;
+                       session->partial_recv_table = partial_recv_table;
+                       return;
                }
+       }
+       g_free(path);
 
-               if ((drop_ok = inc_drop_message(file, state)) < 0) {
-                       state->inc_state = INC_ERROR;
-                       return -1;
-               }
-       
-               state->cur_total_bytes += state->msg[state->cur_msg].size;
-               state->cur_total_num++;
+       now = time(NULL);
 
-               keep_for = (state->ac_prefs && state->ac_prefs->leave_time) ? 
-                          atoi(state->ac_prefs->leave_time) : 0;
+       while (fgets(buf, sizeof(buf), fp) != NULL) {
+               gchar tmp[POPBUFSIZE];
+               strretchomp(buf);
+               recv_time = RECV_TIME_NONE;
+               partial_recv = POP3_TOTALLY_RECEIVED;
+               
+               if (sscanf(buf, "%s\t%ld\t%s", uidl, (long int *) &recv_time, tmp) < 3) {
+                       if (sscanf(buf, "%s\t%ld", uidl, (long int *) &recv_time) != 2) {
+                               if (sscanf(buf, "%s", uidl) != 1)
+                                       continue;
+                               else {
+                                       recv_time = now;
+                                       strcpy(tmp, "0");
+                               }
+                       } else {
+                               strcpy(tmp, "0");
+                       }
+               }
 
-               if (drop_ok == 0 && state->ac_prefs->rmmail && keep_for == 0)
-                       return POP3_DELETE_SEND;
+               if (recv_time == RECV_TIME_NONE)
+                       recv_time = RECV_TIME_RECEIVED;
+               g_hash_table_insert(table, g_strdup(uidl),
+                                   GINT_TO_POINTER(recv_time));
+               if (strlen(tmp) == 1)
+                       partial_recv = atoi(tmp); /* totally received ?*/
+               else
+                       partial_recv = POP3_MUST_COMPLETE_RECV;
 
-               state->msg[state->cur_msg].received = TRUE;
+               g_hash_table_insert(partial_recv_table, g_strdup(uidl),
+                                   GINT_TO_POINTER(partial_recv));
+       }
 
-               if (state->cur_msg < state->count) {
-                       state->cur_msg++;
-                       LOOKUP_NEXT_MSG();
-                       return POP3_RETR_SEND;
-               } else
-                       return POP3_LOGOUT_SEND;
-       } else if (ok == PS_PROTOCOL)
-               return POP3_LOGOUT_SEND;
-       else
-               return -1;
+       fclose(fp);
+       session->uidl_table = table;
+       session->partial_recv_table = partial_recv_table;
+       
+       return;
 }
 
-gint pop3_delete_send(SockInfo *sock, gpointer data)
+#define TRY(func) \
+if (!(func)) \
+{ \
+       g_warning("failed to write\n"); \
+       goto err_write;                 \
+} \
+
+gint pop3_write_uidl_list(Pop3Session *session)
 {
-       Pop3State *state = (Pop3State *)data;
+       gchar *path, *tmp_path;
+       FILE *fp;
+       Pop3MsgInfo *msg;
+       gint n;
+       gchar *sanitized_uid = g_strdup(session->ac_prefs->userid);
+       
+       subst_for_filename(sanitized_uid);
+       
+
+       if (!session->uidl_is_valid) return 0;
 
-       /* inc_progress_update(state, POP3_DELETE_SEND); */
+       path = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
+                          "uidl", G_DIR_SEPARATOR_S,
+                          session->ac_prefs->recv_server,
+                          "-", sanitized_uid, NULL);
+       tmp_path = g_strconcat(path, ".tmp", NULL);
 
-       pop3_gen_send(sock, "DELE %d", state->cur_msg);
+       g_free(sanitized_uid);
+
+       if ((fp = g_fopen(tmp_path, "wb")) == NULL) {
+               FILE_OP_ERROR(tmp_path, "fopen");
+               goto err_write;
+       }
+
+       for (n = 1; n <= session->count; n++) {
+               msg = &session->msg[n];
+               if (msg->uidl && msg->received &&
+                   (!msg->deleted || session->state != POP3_DONE))
+                       TRY(fprintf(fp, "%s\t%ld\t%d\n", 
+                               msg->uidl, (long int) 
+                               msg->recv_time, 
+                               msg->partial_recv) 
+                           > 0);
+       }
 
-       return POP3_DELETE_RECV;
+       if (fclose(fp) == EOF) {
+               FILE_OP_ERROR(tmp_path, "fclose");
+               fp = NULL;
+               goto err_write;
+       }
+       fp = NULL;
+#ifdef G_OS_WIN32
+       claws_unlink(path);
+#endif
+       if (g_rename(tmp_path, path) < 0) {
+               FILE_OP_ERROR(path, "rename");
+               goto err_write;
+       }
+       g_free(path);
+       g_free(tmp_path);
+       return 0;
+err_write:
+       if (fp)
+               fclose(fp);
+       g_free(path);
+       g_free(tmp_path);
+       return -1;
 }
 
-gint pop3_delete_recv(SockInfo *sock, gpointer data)
-{
-       Pop3State *state = (Pop3State *)data;
-       gint ok;
+#undef TRY
 
-       if ((ok = pop3_ok(sock, NULL)) == PS_SUCCESS) {
-               if (state->ac_prefs->session_type == RETR_NORMAL)
-                       state->msg[state->cur_msg].deleted = TRUE;
+static gint pop3_write_msg_to_file(const gchar *file, const gchar *data,
+                                  guint len, const gchar *prefix)
+{
+       FILE *fp;
+       const gchar *prev, *cur;
 
-               if (pop3_delete_header(state) == TRUE) 
-                       return POP3_DELETE_SEND;
+       g_return_val_if_fail(file != NULL, -1);
 
-               if (state->cur_msg < state->count) {
-                       state->cur_msg++;
-                       LOOKUP_NEXT_MSG();
-                       return POP3_RETR_SEND;
-               } else
-                       return POP3_LOGOUT_SEND;
-       } else if (ok == PS_PROTOCOL)
-               return POP3_LOGOUT_SEND;
-       else
+       if ((fp = g_fopen(file, "wb")) == NULL) {
+               FILE_OP_ERROR(file, "fopen");
                return -1;
-}
+       }
 
-gint pop3_logout_send(SockInfo *sock, gpointer data)
-{
-       Pop3State *state = (Pop3State *)data;
-       gchar **parts;
-       
-       while (state->uidl_todelete_list != NULL) {
-               /*
-                * FIXME: doesn't feel right - no checks for parts
-                */
-               parts = g_strsplit((gchar *) state->uidl_todelete_list->data, " ", 2);
-               state->uidl_todelete_list = g_slist_remove
-                       (state->uidl_todelete_list, state->uidl_todelete_list->data);
-               pop3_gen_send(sock, "DELE %s", parts[0]);
-               if (pop3_ok(sock, NULL) != PS_SUCCESS)
-                       log_warning(_("error occurred on DELE\n"));
-               g_strfreev(parts);      
+       if (change_file_mode_rw(fp, file) < 0)
+               FILE_OP_ERROR(file, "chmod");
+
+       if (prefix != NULL) {
+               if (fprintf(fp, "%s\n", prefix) < 0) {
+                       FILE_OP_ERROR(file, "fprintf");
+                       fclose(fp);
+                       claws_unlink(file);
+                       return -1;
+               }
        }
        
-       inc_progress_update(state, POP3_LOGOUT_SEND);
+       /* +------------------+----------------+--------------------------+ *
+        * ^data              ^prev            ^cur             data+len-1^ */
+
+       prev = data;
+       while ((cur = (gchar *)my_memmem(prev, len - (prev - data), "\r\n", 2))
+              != NULL) {
+               if ((cur > prev && fwrite(prev, 1, cur - prev, fp) < 1) ||
+                   fputc('\n', fp) == EOF) {
+                       FILE_OP_ERROR(file, "fwrite");
+                       g_warning("can't write to file: %s\n", file);
+                       fclose(fp);
+                       claws_unlink(file);
+                       return -1;
+               }
+
+               if (cur == data + len - 1) {
+                       prev = cur + 1;
+                       break;
+               }
 
-       pop3_gen_send(sock, "QUIT");
+               if (*(cur + 1) == '\n')
+                       prev = cur + 2;
+               else
+                       prev = cur + 1;
 
-       return POP3_LOGOUT_RECV;
-}
+               if (prev - data < len - 1 && *prev == '.' && *(prev + 1) == '.')
+                       prev++;
 
-gint pop3_logout_recv(SockInfo *sock, gpointer data)
-{
-       if (pop3_ok(sock, NULL) == PS_SUCCESS)
+               if (prev - data >= len)
+                       break;
+       }
+
+       if (prev - data < len &&
+           fwrite(prev, 1, len - (prev - data), fp) < 1) {
+               FILE_OP_ERROR(file, "fwrite");
+               g_warning("can't write to file: %s\n", file);
+               fclose(fp);
+               claws_unlink(file);
                return -1;
-       else
+       }
+       if (data[len - 1] != '\r' && data[len - 1] != '\n') {
+               if (fputc('\n', fp) == EOF) {
+                       FILE_OP_ERROR(file, "fputc");
+                       g_warning("can't write to file: %s\n", file);
+                       fclose(fp);
+                       claws_unlink(file);
+                       return -1;
+               }
+       }
+
+       if (fclose(fp) == EOF) {
+               FILE_OP_ERROR(file, "fclose");
+               claws_unlink(file);
                return -1;
+       }
+
+       return 0;
 }
 
-static gint pop3_ok(SockInfo *sock, gchar *argbuf)
+static Pop3State pop3_lookup_next(Pop3Session *session)
 {
-       gint ok;
-       gchar buf[POPBUFSIZE + 1];
-       gchar *bufp;
-
-       if ((ok = pop3_gen_recv(sock, buf, sizeof(buf))) == PS_SUCCESS) {
-               bufp = buf;
-               if (*bufp == '+' || *bufp == '-')
-                       bufp++;
-               else
-                       return PS_PROTOCOL;
-
-               while (isalpha(*bufp))
-                       bufp++;
-
-               if (*bufp)
-                       *(bufp++) = '\0';
-
-               if (!strcmp(buf, "+OK"))
-                       ok = PS_SUCCESS;
-               else if (!strncmp(buf, "-ERR", 4)) {
-                       if (strstr(bufp, "lock") ||
-                                strstr(bufp, "Lock") ||
-                                strstr(bufp, "LOCK") ||
-                                strstr(bufp, "wait"))
-                               ok = PS_LOCKBUSY;
-                       else
-                               ok = PS_PROTOCOL;
+       Pop3MsgInfo *msg;
+       PrefsAccount *ac = session->ac_prefs;
+       gint size;
+       gboolean size_limit_over;
+
+       for (;;) {
+               msg = &session->msg[session->cur_msg];
+               size = msg->size;
+               size_limit_over =
+                   (ac->enable_size_limit &&
+                    ac->size_limit > 0 &&
+                    size > ac->size_limit * 1024);
+
+               if (ac->rmmail &&
+                   msg->recv_time != RECV_TIME_NONE &&
+                   msg->recv_time != RECV_TIME_KEEP &&
+                   msg->partial_recv == POP3_TOTALLY_RECEIVED &&
+                   session->current_time - msg->recv_time >=
+                    ((ac->msg_leave_time * 24 * 60 * 60) +
+                     (ac->msg_leave_hour * 60 * 60))) {
+                       log_message(LOG_PROTOCOL, 
+                                       _("POP3: Deleting expired message %d [%s]\n"),
+                                       session->cur_msg, msg->uidl?msg->uidl:" ");
+                       session->cur_total_bytes += size;
+                       pop3_delete_send(session);
+                       return POP3_DELETE;
+               }
 
-                       if (*bufp)
-                               fprintf(stderr, "POP3: %s\n", bufp);
+               if (size_limit_over) {
+                       if (!msg->received && msg->partial_recv != 
+                           POP3_MUST_COMPLETE_RECV) {
+                               pop3_top_send(session, ac->size_limit);
+                               return POP3_TOP;
+                       } else if (msg->partial_recv == POP3_MUST_COMPLETE_RECV)
+                               break;
+
+                       log_message(LOG_PROTOCOL, 
+                                       _("POP3: Skipping message %d [%s] (%d bytes)\n"),
+                                       session->cur_msg, msg->uidl?msg->uidl:" ", size);
+               }
+               
+               if (size == 0 || msg->received || size_limit_over) {
+                       session->cur_total_bytes += size;
+                       if (session->cur_msg == session->count) {
+                               pop3_logout_send(session);
+                               return POP3_LOGOUT;
+                       } else
+                               session->cur_msg++;
                } else
-                       ok = PS_PROTOCOL;
-
-               if (argbuf)
-                       strcpy(argbuf, bufp);
+                       break;
        }
 
-       return ok;
+       pop3_retr_send(session);
+       return POP3_RETR;
 }
 
-static void pop3_gen_send(SockInfo *sock, const gchar *format, ...)
+static Pop3ErrorValue pop3_ok(Pop3Session *session, const gchar *msg)
 {
-       gchar buf[POPBUFSIZE + 1];
-       va_list args;
-
-       va_start(args, format);
-       g_vsnprintf(buf, sizeof(buf) - 2, format, args);
-       va_end(args);
+       Pop3ErrorValue ok;
+
+       log_print(LOG_PROTOCOL, "POP3< %s\n", msg);
+
+       if (!strncmp(msg, "+OK", 3))
+               ok = PS_SUCCESS;
+       else if (!strncmp(msg, "-ERR", 4)) {
+               if (strstr(msg + 4, "lock") ||
+                   strstr(msg + 4, "Lock") ||
+                   strstr(msg + 4, "LOCK") ||
+                   strstr(msg + 4, "wait")) {
+                       log_error(LOG_PROTOCOL, _("mailbox is locked\n"));
+                       ok = PS_LOCKBUSY;
+               } else if (strcasestr(msg + 4, "timeout")) {
+                       log_error(LOG_PROTOCOL, _("Session timeout\n"));
+                       ok = PS_ERROR;
+               } else {
+                       switch (session->state) {
+#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+                       case POP3_STLS:
+                               log_error(LOG_PROTOCOL, _("couldn't start TLS session\n"));
+                               ok = PS_ERROR;
+                               break;
+#endif
+                       case POP3_GETAUTH_USER:
+                       case POP3_GETAUTH_PASS:
+                       case POP3_GETAUTH_APOP:
+                               log_error(LOG_PROTOCOL, _("error occurred on authentication\n"));
+                               ok = PS_AUTHFAIL;
+                               break;
+                       case POP3_GETRANGE_LAST:
+                       case POP3_GETRANGE_UIDL:
+                       case POP3_TOP:
+                               log_warning(LOG_PROTOCOL, _("command not supported\n"));
+                               ok = PS_NOTSUPPORTED;
+                               break;
+                               
+                       default:
+                               log_error(LOG_PROTOCOL, _("error occurred on POP3 session\n"));
+                               ok = PS_ERROR;
+                       }
+               }
 
-       if (!strncasecmp(buf, "PASS ", 5))
-               log_print("POP3> PASS ********\n");
-       else
-               log_print("POP3> %s\n", buf);
+               g_free(session->error_msg);
+               session->error_msg = g_strdup(msg);
+               g_printerr("POP3: %s\n", msg);
+       } else
+               ok = PS_PROTOCOL;
 
-       strcat(buf, "\r\n");
-       sock_write(sock, buf, strlen(buf));
+       session->error_val = ok;
+       return ok;
 }
 
-static gint pop3_gen_recv(SockInfo *sock, gchar *buf, gint size)
+static gint pop3_session_recv_msg(Session *session, const gchar *msg)
 {
-       if (sock_gets(sock, buf, size) < 0) {
-               return PS_SOCKET;
-       } else {
-               strretchomp(buf);
-               log_print("POP3< %s\n", buf);
+       Pop3Session *pop3_session = POP3_SESSION(session);
+       Pop3ErrorValue val = PS_SUCCESS;
+       const gchar *body;
+
+       body = msg;
+       if (pop3_session->state != POP3_GETRANGE_UIDL_RECV &&
+           pop3_session->state != POP3_GETSIZE_LIST_RECV) {
+               val = pop3_ok(pop3_session, msg);
+               if (val != PS_SUCCESS) {
+                       if (val != PS_NOTSUPPORTED) {
+                               pop3_session->state = POP3_ERROR;
+                               return -1;
+                       }
+               }
+
+               if (*body == '+' || *body == '-')
+                       body++;
+               while (g_ascii_isalpha(*body))
+                       body++;
+               while (g_ascii_isspace(*body))
+                       body++;
+       }
 
-               return PS_SUCCESS;
+       switch (pop3_session->state) {
+       case POP3_READY:
+       case POP3_GREETING:
+               pop3_greeting_recv(pop3_session, body);
+#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+               if (pop3_session->ac_prefs->ssl_pop == SSL_STARTTLS)
+                       val = pop3_stls_send(pop3_session);
+               else
+#endif
+               if (pop3_session->ac_prefs->use_apop_auth)
+                       val = pop3_getauth_apop_send(pop3_session);
+               else
+                       val = pop3_getauth_user_send(pop3_session);
+               break;
+#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+       case POP3_STLS:
+               if (pop3_stls_recv(pop3_session) != PS_SUCCESS)
+                       return -1;
+               if (pop3_session->ac_prefs->use_apop_auth)
+                       val = pop3_getauth_apop_send(pop3_session);
+               else
+                       val = pop3_getauth_user_send(pop3_session);
+               break;
+#endif
+       case POP3_GETAUTH_USER:
+               val = pop3_getauth_pass_send(pop3_session);
+               break;
+       case POP3_GETAUTH_PASS:
+       case POP3_GETAUTH_APOP:
+               if (!pop3_session->pop_before_smtp)
+                       val = pop3_getrange_stat_send(pop3_session);
+               else
+                       val = pop3_logout_send(pop3_session);
+               break;
+       case POP3_GETRANGE_STAT:
+               if (pop3_getrange_stat_recv(pop3_session, body) < 0)
+                       return -1;
+               if (pop3_session->count > 0)
+                       val = pop3_getrange_uidl_send(pop3_session);
+               else
+                       val = pop3_logout_send(pop3_session);
+               break;
+       case POP3_GETRANGE_LAST:
+               if (val == PS_NOTSUPPORTED)
+                       pop3_session->error_val = PS_SUCCESS;
+               else if (pop3_getrange_last_recv(pop3_session, body) < 0)
+                       return -1;
+               if (pop3_session->cur_msg > 0)
+                       val = pop3_getsize_list_send(pop3_session);
+               else
+                       val = pop3_logout_send(pop3_session);
+               break;
+       case POP3_GETRANGE_UIDL:
+               if (val == PS_NOTSUPPORTED) {
+                       pop3_session->error_val = PS_SUCCESS;
+                       val = pop3_getrange_last_send(pop3_session);
+               } else {
+                       pop3_session->state = POP3_GETRANGE_UIDL_RECV;
+                       session_recv_data(session, 0, ".\r\n");
+               }
+               break;
+       case POP3_GETSIZE_LIST:
+               pop3_session->state = POP3_GETSIZE_LIST_RECV;
+               session_recv_data(session, 0, ".\r\n");
+               break;
+       case POP3_RETR:
+               pop3_session->state = POP3_RETR_RECV;
+               session_recv_data(session, 0, ".\r\n");
+               break;
+       case POP3_TOP:
+               if (val == PS_NOTSUPPORTED) {
+                       pop3_session->error_val = PS_SUCCESS;
+               } else {
+                       pop3_session->state = POP3_TOP_RECV;
+                       session_recv_data(session, 0, ".\r\n");
+               }
+               break;
+       case POP3_DELETE:
+               pop3_delete_recv(pop3_session);
+               if (pop3_session->cur_msg == pop3_session->count)
+                       val = pop3_logout_send(pop3_session);
+               else {
+                       pop3_session->cur_msg++;
+                       if (pop3_lookup_next(pop3_session) == POP3_ERROR)
+                               return -1;
+               }
+               break;
+       case POP3_LOGOUT:
+               pop3_session->state = POP3_DONE;
+               session_disconnect(session);
+               break;
+       case POP3_ERROR:
+       default:
+               return -1;
        }
+
+       return val == PS_SUCCESS?0:-1;
 }
 
-gboolean pop3_delete_header (Pop3State *state)
+static gint pop3_session_recv_data_finished(Session *session, guchar *data,
+                                           guint len)
 {
-       
-       if ( (state->ac_prefs->session_type == DELE_HEADER) &&
-            (g_slist_length(state->ac_prefs->to_delete) > 0) ) {
-
-               state->cur_msg = (gint) state->ac_prefs->to_delete->data;
-               debug_print(_("next to delete %i\n"), state->cur_msg);
-               state->ac_prefs->to_delete = g_slist_remove 
-                       (state->ac_prefs->to_delete, state->ac_prefs->to_delete->data);
-               return TRUE;
+       Pop3Session *pop3_session = POP3_SESSION(session);
+       Pop3ErrorValue val = PS_SUCCESS;
+
+       switch (pop3_session->state) {
+       case POP3_GETRANGE_UIDL_RECV:
+               val = pop3_getrange_uidl_recv(pop3_session, data, len);
+               if (val == PS_SUCCESS) {
+                       if (pop3_session->new_msg_exist)
+                               pop3_getsize_list_send(pop3_session);
+                       else
+                               pop3_logout_send(pop3_session);
+               } else
+                       return -1;
+               break;
+       case POP3_GETSIZE_LIST_RECV:
+               val = pop3_getsize_list_recv(pop3_session, data, len);
+               if (val == PS_SUCCESS) {
+                       if (pop3_lookup_next(pop3_session) == POP3_ERROR)
+                               return -1;
+               } else
+                       return -1;
+               break;
+       case POP3_RETR_RECV:
+               if (pop3_retr_recv(pop3_session, data, len) < 0)
+                       return -1;
+
+               if (pop3_session->ac_prefs->rmmail &&
+                   pop3_session->ac_prefs->msg_leave_time == 0 &&
+                   pop3_session->ac_prefs->msg_leave_hour == 0 &&
+                   pop3_session->msg[pop3_session->cur_msg].recv_time
+                   != RECV_TIME_KEEP)
+                       pop3_delete_send(pop3_session);
+               else if (pop3_session->cur_msg == pop3_session->count)
+                       pop3_logout_send(pop3_session);
+               else {
+                       pop3_session->cur_msg++;
+                       if (pop3_lookup_next(pop3_session) == POP3_ERROR)
+                               return -1;
+               }
+               break;
+       case POP3_TOP_RECV:
+               if (pop3_top_recv(pop3_session, data, len) < 0)
+                       return -1;
+
+               if (pop3_session->cur_msg == pop3_session->count)
+                       pop3_logout_send(pop3_session);
+               else {
+                       pop3_session->cur_msg++;
+                       if (pop3_lookup_next(pop3_session) == POP3_ERROR)
+                               return -1;
+               }
+               break;
+       case POP3_TOP:
+               log_warning(LOG_PROTOCOL, _("TOP command unsupported\n"));
+               if (pop3_session->cur_msg == pop3_session->count)
+                       pop3_logout_send(pop3_session);
+               else {
+                       pop3_session->cur_msg++;
+                       if (pop3_lookup_next(pop3_session) == POP3_ERROR)
+                               return -1;
+               }
+               break;
+       case POP3_ERROR:
+       default:
+               return -1;
        }
-       return FALSE;
+
+       return 0;
 }