diff --git a/src/config.h b/src/config.h
index ca056dfe..b6fe90f7 100644
--- a/src/config.h
+++ b/src/config.h
@@ -13,7 +13,7 @@
 
 #define VERSION "0.1.23-master-branch"
 
-#define BUILD 761
+#define BUILD 763
 
 #define HOSTID "mailarchiver"
 
@@ -87,9 +87,10 @@
 #define SQL_MESSAGES_VIEW "v_messages"
 #define SQL_ATTACHMENTS_VIEW "v_attachment"
 
-#define SQL_PREPARED_STMT_SELECT_MESSAGE_ID          "SELECT message_id FROM " SQL_METADATA_TABLE "  WHERE message_id=?"
 #define SQL_PREPARED_STMT_GET_META_ID_BY_MESSAGE_ID  "SELECT id FROM " SQL_METADATA_TABLE " WHERE message_id=?"
 #define SQL_PREPARED_STMT_INSERT_INTO_RCPT_TABLE     "INSERT INTO " SQL_RECIPIENT_TABLE " (`id`,`to`,`todomain`) VALUES(?,?,?)"
+#define SQL_PREPARED_STMT_INSERT_INTO_SPHINX_TABLE   "INSERT INTO " SQL_SPHINX_TABLE " (`id`, `from`, `to`, `fromdomain`, `todomain`, `subject`, `body`, `arrived`, `sent`, `size`, `direction`, `folder`, `attachments`, `attachment_types`) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?)"
+#define SQL_PREPARED_STMT_INSERT_INTO_META_TABLE     "INSERT INTO " SQL_METADATA_TABLE " (`from`,`fromdomain`,`subject`,`spam`,`arrived`,`sent`,`retained`,`size`,`hlen`,`direction`,`attachments`,`piler_id`,`message_id`,`reference`,`digest`,`bodydigest`,`vcode`) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"
 
 
 /* Error codes */
diff --git a/src/defs.h b/src/defs.h
index 9e68dbec..1b0a3c08 100644
--- a/src/defs.h
+++ b/src/defs.h
@@ -246,6 +246,13 @@ struct __data {
    char starttls[TINYBUFSIZE];
    char mydomains[MAXBUFSIZE];
 
+#ifdef NEED_MYSQL
+   MYSQL_STMT *stmt_get_meta_id_by_message_id;
+   MYSQL_STMT *stmt_insert_into_rcpt_table;
+   MYSQL_STMT *stmt_insert_into_sphinx_table;
+   MYSQL_STMT *stmt_insert_into_meta_table;
+#endif
+
 #ifdef HAVE_TRE
    struct rule *archiving_rules;
    struct rule *retention_rules;
diff --git a/src/message.c b/src/message.c
index 7df3f3cc..8d2ba671 100644
--- a/src/message.c
+++ b/src/message.c
@@ -34,89 +34,18 @@ int prepare_a_mysql_statement(struct session_data *sdata, MYSQL_STMT **stmt, cha
 }
 
 
-int is_existing_message_id(struct session_data *sdata, struct _state *state, struct __data *data, struct __config *cfg){
-   int rc=0;
-   char s[SMALLBUFSIZE];
-   MYSQL_STMT *stmt;
-   MYSQL_BIND bind[1];
-   my_bool is_null[1];
-   unsigned long len=0;
-
-
-   snprintf(s, SMALLBUFSIZE-1, "SELECT message_id FROM %s WHERE message_id=?", SQL_METADATA_TABLE);
-
-   if(prepare_a_mysql_statement(sdata, &stmt, s) == ERR) goto ENDE;
-
-
-   memset(bind, 0, sizeof(bind));
-
-   bind[0].buffer_type = MYSQL_TYPE_STRING;
-   bind[0].buffer = state->message_id;
-   bind[0].is_null = 0;
-   len = strlen(state->message_id); bind[0].length = &len;
-
-   if(mysql_stmt_bind_param(stmt, bind)){
-      syslog(LOG_PRIORITY, "%s: %s.mysql_stmt_bind_param() error: %s", sdata->ttmpfile, SQL_METADATA_TABLE, mysql_stmt_error(stmt));
-      goto CLOSE;
-   }
-
-
-   if(mysql_stmt_execute(stmt)){
-      syslog(LOG_PRIORITY, "%s: %s.mysql_stmt_execute() error: %s", sdata->ttmpfile, SQL_METADATA_TABLE, mysql_stmt_error(stmt));
-      goto CLOSE;
-   }
-
-
-   memset(bind, 0, sizeof(bind));
-
-   bind[0].buffer_type = MYSQL_TYPE_STRING;
-   bind[0].buffer = &s[0];
-   bind[0].buffer_length = sizeof(s)-1;
-   bind[0].is_null = &is_null[0];
-   bind[0].length = &len;
-
-
-   if(mysql_stmt_bind_result(stmt, bind)){
-      syslog(LOG_PRIORITY, "%s: %s.mysql_stmt_bind_result() error: %s", sdata->ttmpfile, SQL_METADATA_TABLE, mysql_stmt_error(stmt));
-      goto CLOSE;
-   }
-
-
-   if(mysql_stmt_store_result(stmt)){
-      syslog(LOG_PRIORITY, "%s: %s.mysql_stmt_store_result() error: %s", sdata->ttmpfile, SQL_METADATA_TABLE, mysql_stmt_error(stmt));
-      goto CLOSE;
-   }
-
-   if(!mysql_stmt_fetch(stmt)){
-      syslog(LOG_PRIORITY, "%s: found message_id:*%s*(%ld) null=%d", sdata->ttmpfile, s, len, is_null[0]);
-      if(is_null[0] == 0) rc = 1;
-   }
-
-CLOSE:
-   mysql_stmt_close(stmt);
-
-ENDE:
-
-   return rc;
-}
-
-
 int store_index_data(struct session_data *sdata, struct _state *state, struct __data *data, uint64 id, struct __config *cfg){
    int rc=ERR;
-   char *subj, s[SMALLBUFSIZE];
+   char *subj;
 
-   MYSQL_STMT *stmt;
-   MYSQL_BIND bind[7];
-   unsigned long len[7];
+   MYSQL_BIND bind[14];
+   unsigned long len[14];
 
    subj = state->b_subject;
    if(*subj == ' ') subj++;
 
 
-   snprintf(s, sizeof(s)-1, "INSERT INTO %s (`id`, `from`, `to`, `fromdomain`, `todomain`, `subject`, `body`, `arrived`, `sent`, `size`, `direction`, `folder`, `attachments`, `attachment_types`) values(%llu,?,?,?,?,?,?,%ld,%ld,%d,%d,%d,%d,?)", SQL_SPHINX_TABLE, id, sdata->now, sdata->sent, sdata->tot_len, sdata->direction, data->folder, state->n_attachments);
-
-   if(prepare_a_mysql_statement(sdata, &stmt, s) == ERR) return rc;
-
+   if(prepare_a_mysql_statement(sdata, &(data->stmt_insert_into_sphinx_table), SQL_PREPARED_STMT_INSERT_INTO_SPHINX_TABLE) == ERR) return rc;
 
 
    fix_email_address_for_sphinx(state->b_from);
@@ -127,50 +56,84 @@ int store_index_data(struct session_data *sdata, struct _state *state, struct __
 
    memset(bind, 0, sizeof(bind));
 
-   bind[0].buffer_type = MYSQL_TYPE_STRING;
-   bind[0].buffer = state->b_from;
+   bind[0].buffer_type = MYSQL_TYPE_LONGLONG;
+   bind[0].buffer = (char *)&id;
    bind[0].is_null = 0;
-   len[0] = strlen(state->b_from); bind[0].length = &len[0];
+   bind[0].length = 0;
 
    bind[1].buffer_type = MYSQL_TYPE_STRING;
-   bind[1].buffer = state->b_to;
+   bind[1].buffer = state->b_from;
    bind[1].is_null = 0;
-   len[1] = strlen(state->b_to); bind[1].length = &len[1];
+   len[1] = strlen(state->b_from); bind[1].length = &len[1];
 
    bind[2].buffer_type = MYSQL_TYPE_STRING;
-   bind[2].buffer = state->b_from_domain;
+   bind[2].buffer = state->b_to;
    bind[2].is_null = 0;
-   len[2] = strlen(state->b_from_domain); bind[2].length = &len[2];
+   len[2] = strlen(state->b_to); bind[2].length = &len[2];
 
    bind[3].buffer_type = MYSQL_TYPE_STRING;
-   bind[3].buffer = state->b_to_domain;
+   bind[3].buffer = state->b_from_domain;
    bind[3].is_null = 0;
-   len[3] = strlen(state->b_to_domain); bind[3].length = &len[3];
-
+   len[3] = strlen(state->b_from_domain); bind[3].length = &len[3];
 
    bind[4].buffer_type = MYSQL_TYPE_STRING;
-   bind[4].buffer = subj;
+   bind[4].buffer = state->b_to_domain;
    bind[4].is_null = 0;
-   len[4] = strlen(subj); bind[4].length = &len[4];
+   len[4] = strlen(state->b_to_domain); bind[4].length = &len[4];
 
    bind[5].buffer_type = MYSQL_TYPE_STRING;
-   bind[5].buffer = state->b_body;
+   bind[5].buffer = subj;
    bind[5].is_null = 0;
-   len[5] = strlen(state->b_body); bind[5].length = &len[5];
+   len[5] = strlen(subj); bind[5].length = &len[5];
 
    bind[6].buffer_type = MYSQL_TYPE_STRING;
-   bind[6].buffer = sdata->attachments;
+   bind[6].buffer = state->b_body;
    bind[6].is_null = 0;
-   len[6] = strlen(sdata->attachments); bind[6].length = &len[6];
+   len[6] = strlen(state->b_body); bind[6].length = &len[6];
+
+   bind[7].buffer_type = MYSQL_TYPE_LONG;
+   bind[7].buffer = (char *)&sdata->now;
+   bind[7].is_null = 0;
+   bind[7].length = 0;
+
+   bind[8].buffer_type = MYSQL_TYPE_LONG;
+   bind[8].buffer = (char *)&sdata->sent;
+   bind[8].is_null = 0;
+   bind[8].length = 0;
+
+   bind[9].buffer_type = MYSQL_TYPE_LONG;
+   bind[9].buffer = (char *)&sdata->tot_len;
+   bind[9].is_null = 0;
+   bind[9].length = 0;
+
+   bind[10].buffer_type = MYSQL_TYPE_LONG;
+   bind[10].buffer = (char *)&sdata->direction;
+   bind[10].is_null = 0;
+   bind[10].length = 0;
+
+   bind[11].buffer_type = MYSQL_TYPE_LONG;
+   bind[11].buffer = (char *)&data->folder;
+   bind[11].is_null = 0;
+   bind[11].length = 0;
+
+   bind[12].buffer_type = MYSQL_TYPE_LONG;
+   bind[12].buffer = (char *)&state->n_attachments;
+   bind[12].is_null = 0;
+   bind[12].length = 0;
+
+   bind[13].buffer_type = MYSQL_TYPE_STRING;
+   bind[13].buffer = sdata->attachments;
+   bind[13].is_null = 0;
+   len[13] = strlen(sdata->attachments); bind[13].length = &len[13];
 
 
-   if(mysql_stmt_bind_param(stmt, bind)){
-      syslog(LOG_PRIORITY, "%s: %s.mysql_stmt_bind_param() error: %s", sdata->ttmpfile, SQL_SPHINX_TABLE, mysql_stmt_error(stmt));
+   if(mysql_stmt_bind_param(data->stmt_insert_into_sphinx_table, bind)){
+      syslog(LOG_PRIORITY, "%s: %s.mysql_stmt_bind_param() error: %s", sdata->ttmpfile, SQL_SPHINX_TABLE, mysql_stmt_error(data->stmt_insert_into_sphinx_table));
       goto CLOSE;
    }
 
 
-   if(mysql_stmt_execute(stmt)){
+   if(mysql_stmt_execute(data->stmt_insert_into_sphinx_table)){
       syslog(LOG_PRIORITY, "%s: %s.mysql_stmt_execute error: *%s*", sdata->ttmpfile, SQL_SPHINX_TABLE, mysql_error(&(sdata->mysql)));
       goto CLOSE;
    }
@@ -178,23 +141,19 @@ int store_index_data(struct session_data *sdata, struct _state *state, struct __
    rc = OK;
 
 CLOSE:
-   mysql_stmt_close(stmt);
+   mysql_stmt_close(data->stmt_insert_into_sphinx_table);
 
 
    return rc;
 }
 
 
-uint64 get_metaid_by_messageid(struct session_data *sdata, char *message_id, struct __config *cfg){
+uint64 get_metaid_by_messageid(struct session_data *sdata, struct __data *data, char *message_id, struct __config *cfg){
    unsigned long len=0;
    uint64 id=0;
-   char s[SMALLBUFSIZE];
-   MYSQL_STMT *stmt;
    MYSQL_BIND bind[1];
 
-   snprintf(s, sizeof(s)-1, "SELECT id FROM %s WHERE message_id=?", SQL_METADATA_TABLE);
-
-   if(prepare_a_mysql_statement(sdata, &stmt, s) == ERR) return id;
+   if(prepare_a_mysql_statement(sdata, &(data->stmt_get_meta_id_by_message_id), SQL_PREPARED_STMT_GET_META_ID_BY_MESSAGE_ID) == ERR) return id;
 
    memset(bind, 0, sizeof(bind));
 
@@ -203,11 +162,11 @@ uint64 get_metaid_by_messageid(struct session_data *sdata, char *message_id, str
    bind[0].is_null = 0;
    len = strlen(message_id); bind[0].length = &len;
 
-   if(mysql_stmt_bind_param(stmt, bind)){
+   if(mysql_stmt_bind_param(data->stmt_get_meta_id_by_message_id, bind)){
       goto CLOSE;
    }
 
-   if(mysql_stmt_execute(stmt)){
+   if(mysql_stmt_execute(data->stmt_get_meta_id_by_message_id)){
       goto CLOSE;
    }
 
@@ -219,36 +178,33 @@ uint64 get_metaid_by_messageid(struct session_data *sdata, char *message_id, str
    bind[0].length = 0;
 
 
-   if(mysql_stmt_bind_result(stmt, bind)){
+   if(mysql_stmt_bind_result(data->stmt_get_meta_id_by_message_id, bind)){
       goto CLOSE;
    }
 
 
-   if(mysql_stmt_store_result(stmt)){
+   if(mysql_stmt_store_result(data->stmt_get_meta_id_by_message_id)){
       goto CLOSE;
    }
 
-   mysql_stmt_fetch(stmt);
+   mysql_stmt_fetch(data->stmt_get_meta_id_by_message_id);
 
 CLOSE:
-   mysql_stmt_close(stmt);
+   mysql_stmt_close(data->stmt_get_meta_id_by_message_id);
 
    return id;
 }
 
 
-int store_recipients(struct session_data *sdata, char *to, uint64 id, int log_errors, struct __config *cfg){
+int store_recipients(struct session_data *sdata, struct __data *data, char *to, uint64 id, int log_errors, struct __config *cfg){
    int ret=OK, n=0;
-   char *p, *q, s[SMALLBUFSIZE], puf[SMALLBUFSIZE];
+   char *p, *q, puf[SMALLBUFSIZE];
 
-   MYSQL_STMT *stmt;
-   MYSQL_BIND bind[2];
-   unsigned long len[2];
+   MYSQL_BIND bind[3];
+   unsigned long len[3];
 
 
-   snprintf(s, sizeof(s)-1, "INSERT INTO %s (`id`,`to`,`todomain`) VALUES('%llu',?,?)", SQL_RECIPIENT_TABLE, id);
-
-   if(prepare_a_mysql_statement(sdata, &stmt, s) == ERR) return ERR;
+   if(prepare_a_mysql_statement(sdata, &(data->stmt_insert_into_rcpt_table), SQL_PREPARED_STMT_INSERT_INTO_RCPT_TABLE) == ERR) return ERR;
 
 
    p = to;
@@ -262,24 +218,30 @@ int store_recipients(struct session_data *sdata, char *to, uint64 id, int log_er
 
          memset(bind, 0, sizeof(bind));
 
-         bind[0].buffer_type = MYSQL_TYPE_STRING;
-         bind[0].buffer = &puf[0];
+         bind[0].buffer_type = MYSQL_TYPE_LONGLONG;
+         bind[0].buffer = (char *)&id;
          bind[0].is_null = 0;
-         len[0] = strlen(puf); bind[0].length = &len[0];
+         bind[0].length = 0;
 
          bind[1].buffer_type = MYSQL_TYPE_STRING;
-         bind[1].buffer = q;
+         bind[1].buffer = &puf[0];
          bind[1].is_null = 0;
-         len[1] = strlen(q); bind[1].length = &len[1];
+         len[1] = strlen(puf); bind[1].length = &len[1];
 
-         if(mysql_stmt_bind_param(stmt, bind)){
-            syslog(LOG_PRIORITY, "%s: %s.mysql_stmt_bind_param() error: %s", sdata->ttmpfile, SQL_RECIPIENT_TABLE, mysql_stmt_error(stmt));
+         bind[2].buffer_type = MYSQL_TYPE_STRING;
+         bind[2].buffer = q;
+         bind[2].is_null = 0;
+         len[2] = strlen(q); bind[2].length = &len[2];
+
+
+         if(mysql_stmt_bind_param(data->stmt_insert_into_rcpt_table, bind)){
+            syslog(LOG_PRIORITY, "%s: %s.mysql_stmt_bind_param() error: %s", sdata->ttmpfile, SQL_RECIPIENT_TABLE, mysql_stmt_error(data->stmt_insert_into_rcpt_table));
             ret = ERR;
             goto CLOSE;
          }
 
 
-         if(mysql_stmt_execute(stmt) && log_errors == 1){
+         if(mysql_stmt_execute(data->stmt_insert_into_rcpt_table) && log_errors == 1){
             syslog(LOG_PRIORITY, "%s: %s.mysql_stmt_execute error: *%s*", sdata->ttmpfile, SQL_RECIPIENT_TABLE, mysql_error(&(sdata->mysql)));
             ret = ERR;
          }
@@ -290,7 +252,7 @@ int store_recipients(struct session_data *sdata, char *to, uint64 id, int log_er
 
 
 CLOSE:
-   mysql_stmt_close(stmt);
+   mysql_stmt_close(data->stmt_insert_into_rcpt_table);
 
    if(cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: added %d recipients", sdata->ttmpfile, n);
 
@@ -302,9 +264,8 @@ int store_meta_data(struct session_data *sdata, struct _state *state, struct __d
    int rc, ret=ERR;
    char *subj, *p, s[MAXBUFSIZE], s2[SMALLBUFSIZE], vcode[2*DIGEST_LENGTH+1], ref[2*DIGEST_LENGTH+1];
 
-   MYSQL_STMT *stmt;
-   MYSQL_BIND bind[4];
-   unsigned long len[4];
+   MYSQL_BIND bind[17];
+   unsigned long len[17];
 
    my_ulonglong id=0;
 
@@ -320,11 +281,7 @@ int store_meta_data(struct session_data *sdata, struct _state *state, struct __d
    if(strlen(state->reference) > 10) digest_string(state->reference, &ref[0]);
 
 
-   snprintf(s, MAXBUFSIZE-1, "INSERT INTO %s (`from`,`fromdomain`,`subject`,`spam`,`arrived`,`sent`,`retained`,`size`,`hlen`,`direction`,`attachments`,`piler_id`,`message_id`,`reference`,`digest`,`bodydigest`,`vcode`) VALUES(?,?,?,%d,%ld,%ld,%ld,%d,%d,%d,%d,'%s',?,'%s','%s','%s','%s')", SQL_METADATA_TABLE, sdata->spam_message, sdata->now, sdata->sent, sdata->retained, sdata->tot_len, sdata->hdr_len, sdata->direction, state->n_attachments, sdata->ttmpfile, ref, sdata->digest, sdata->bodydigest, vcode);
-
-   if(cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: meta sql: *%s*", sdata->ttmpfile, s);
-
-   if(prepare_a_mysql_statement(sdata, &stmt, s) == ERR) return ERR;
+   if(prepare_a_mysql_statement(sdata, &(data->stmt_insert_into_meta_table), SQL_PREPARED_STMT_INSERT_INTO_META_TABLE) == ERR) return ERR;
 
    memset(s2, 0, sizeof(s2));
 
@@ -360,27 +317,94 @@ int store_meta_data(struct session_data *sdata, struct _state *state, struct __d
    bind[2].is_null = 0;
    len[2] = strlen(subj); bind[2].length = &len[2];
 
-   bind[3].buffer_type = MYSQL_TYPE_STRING;
-   bind[3].buffer = state->message_id;
+   bind[3].buffer_type = MYSQL_TYPE_LONG;
+   bind[3].buffer = (char *)&sdata->spam_message;
    bind[3].is_null = 0;
-   len[3] = strlen(state->message_id); bind[3].length = &len[3];
+   bind[3].length = 0;
 
-   if(mysql_stmt_bind_param(stmt, bind)){
-      syslog(LOG_PRIORITY, "%s: %s.mysql_stmt_bind_param() error: %s", sdata->ttmpfile, SQL_METADATA_TABLE, mysql_stmt_error(stmt));
+   bind[4].buffer_type = MYSQL_TYPE_LONG;
+   bind[4].buffer = (char *)&sdata->now;
+   bind[4].is_null = 0;
+   bind[4].length = 0;
+
+   bind[5].buffer_type = MYSQL_TYPE_LONG;
+   bind[5].buffer = (char *)&sdata->sent;
+   bind[5].is_null = 0;
+   bind[5].length = 0;
+
+   bind[6].buffer_type = MYSQL_TYPE_LONG;
+   bind[6].buffer = (char *)&sdata->retained;
+   bind[6].is_null = 0;
+   bind[6].length = 0;
+
+   bind[7].buffer_type = MYSQL_TYPE_LONG;
+   bind[7].buffer = (char *)&sdata->tot_len;
+   bind[7].is_null = 0;
+   bind[7].length = 0;
+
+   bind[8].buffer_type = MYSQL_TYPE_LONG;
+   bind[8].buffer = (char *)&sdata->hdr_len;
+   bind[8].is_null = 0;
+   bind[8].length = 0;
+
+   bind[9].buffer_type = MYSQL_TYPE_LONG;
+   bind[9].buffer = (char *)&sdata->direction;
+   bind[9].is_null = 0;
+   bind[9].length = 0;
+
+   bind[10].buffer_type = MYSQL_TYPE_LONG;
+   bind[10].buffer = (char *)&state->n_attachments;
+   bind[10].is_null = 0;
+   bind[10].length = 0;
+
+   bind[11].buffer_type = MYSQL_TYPE_STRING;
+   bind[11].buffer = sdata->ttmpfile;
+   bind[11].is_null = 0;
+   len[11] = strlen(sdata->ttmpfile); bind[11].length = &len[11];
+
+   bind[12].buffer_type = MYSQL_TYPE_STRING;
+   bind[12].buffer = state->message_id;
+   bind[12].is_null = 0;
+   len[12] = strlen(state->message_id); bind[12].length = &len[12];
+
+   bind[13].buffer_type = MYSQL_TYPE_STRING;
+   bind[13].buffer = &ref[0];
+   bind[13].is_null = 0;
+   len[13] = strlen(ref); bind[13].length = &len[13];
+
+   bind[14].buffer_type = MYSQL_TYPE_STRING;
+   bind[14].buffer = sdata->digest;
+   bind[14].is_null = 0;
+   len[14] = strlen(sdata->digest); bind[14].length = &len[14];
+
+   bind[15].buffer_type = MYSQL_TYPE_STRING;
+   bind[15].buffer = sdata->bodydigest;
+   bind[15].is_null = 0;
+   len[15] = strlen(sdata->bodydigest); bind[15].length = &len[15];
+
+   bind[16].buffer_type = MYSQL_TYPE_STRING;
+   bind[16].buffer = &vcode[0];
+   bind[16].is_null = 0;
+   len[16] = strlen(vcode); bind[16].length = &len[16];
+
+
+
+   if(mysql_stmt_bind_param(data->stmt_insert_into_meta_table, bind)){
+      syslog(LOG_PRIORITY, "%s: %s.mysql_stmt_bind_param() error: %s", sdata->ttmpfile, SQL_METADATA_TABLE, mysql_stmt_error(data->stmt_insert_into_meta_table));
       goto CLOSE;
    }
 
 
-   rc = mysql_stmt_execute(stmt);
+   rc = mysql_stmt_execute(data->stmt_insert_into_meta_table);
 
    if(rc){
       syslog(LOG_PRIORITY, "%s: %s.mysql_stmt_execute() error: *%s*", sdata->ttmpfile, SQL_METADATA_TABLE, mysql_error(&(sdata->mysql)));
       ret = ERR_EXISTS;
    }
    else {
-      id = mysql_stmt_insert_id(stmt);
+      id = mysql_stmt_insert_id(data->stmt_insert_into_meta_table);
 
-      rc = store_recipients(sdata, state->b_to, id, 1, cfg);
+      rc = store_recipients(sdata, data, state->b_to, id, 1, cfg);
 
       if(cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: stored recipients, rc=%d", sdata->ttmpfile, rc);
 
@@ -396,7 +420,7 @@ int store_meta_data(struct session_data *sdata, struct _state *state, struct __d
    }
 
 CLOSE:
-   mysql_stmt_close(stmt);
+   mysql_stmt_close(data->stmt_insert_into_meta_table);
 
    return ret;
 }
@@ -415,13 +439,14 @@ int process_message(struct session_data *sdata, struct _state *state, struct __d
 
    /* discard if existing message_id */
 
-   if(is_existing_message_id(sdata, state, data, cfg) == 1){
+   id = get_metaid_by_messageid(sdata, data, state->message_id, cfg);
+
+   if(id > 0){
       remove_stripped_attachments(state);
 
       if(strlen(state->b_journal_to) > 0){
-         id = get_metaid_by_messageid(sdata, state->message_id, cfg);
          if(cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: trying to add journal rcpt (%s) to id=%llu for message-id: '%s'", sdata->ttmpfile, state->b_journal_to, id, state->message_id);
-         store_recipients(sdata, state->b_journal_to, id, 0, cfg);
+         store_recipients(sdata, data, state->b_journal_to, id, 0, cfg);
       }
 
       return ERR_EXISTS;