diff --git a/src/config.h b/src/config.h
index 1dffc5ca..e3b4b3e1 100644
--- a/src/config.h
+++ b/src/config.h
@@ -13,7 +13,7 @@
 
 #define VERSION "1.2.0-master"
 
-#define BUILD 947
+#define BUILD 948
 
 #define HOSTID "mailarchiver"
 
diff --git a/src/defs.h b/src/defs.h
index a5d00cda..a5d8673e 100644
--- a/src/defs.h
+++ b/src/defs.h
@@ -380,6 +380,7 @@ struct session_ctx {
    int inj;
    int bdat_rounds;
    int bdat_last_round;
+   struct __config *cfg;
    struct __data *data;
    struct parser_state *parser_state;
    struct counters *counters;
diff --git a/src/piler.c b/src/piler.c
index 256bee53..4d817826 100644
--- a/src/piler.c
+++ b/src/piler.c
@@ -109,6 +109,7 @@ static void child_main(struct child *ptr){
 
    ptr->messages = 0;
    sctx.data = &data;
+   sctx.cfg = &cfg;
 
    if(cfg.verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "child (pid: %d, serial: %d) started main()", getpid(), ptr->serial);
 
@@ -134,7 +135,7 @@ static void child_main(struct child *ptr){
       data.child_serial = ptr->serial;
 
       sig_block(SIGHUP);
-      ptr->messages += handle_smtp_session(&sctx, &cfg);
+      ptr->messages += handle_smtp_session(&sctx);
       sig_unblock(SIGHUP);
 
       close(sctx.new_sd);
diff --git a/src/piler.h b/src/piler.h
index 5fe75fb8..f3ac24e9 100644
--- a/src/piler.h
+++ b/src/piler.h
@@ -35,7 +35,7 @@ int make_digests(struct session_data *sdata, struct __config *cfg);
 void digest_file(char *filename, char *digest);
 void digest_string(char *s, char *digest);
 
-int handle_smtp_session(struct session_ctx *sctx, struct __config *cfg);
+int handle_smtp_session(struct session_ctx *sctx);
 
 void remove_stripped_attachments(struct parser_state *state);
 int process_message(struct session_data *sdata, struct parser_state *state, struct __data *data, struct __config *cfg);
diff --git a/src/session.c b/src/session.c
index 21d8bb4d..abe3b578 100644
--- a/src/session.c
+++ b/src/session.c
@@ -20,12 +20,12 @@
 #include "smtp.h"
 
 int is_blocked_by_tcp_wrappers(int sd);
-void send_response_to_data(struct session_ctx *sctx, struct session_data *sdata, char *rcptto, struct __config *cfg);
-void process_written_file(struct session_ctx *sctx, struct session_data *sdata, struct __config *cfg);
-void process_data(struct session_ctx *sctx, struct session_data *sdata, struct __config *cfg);
+void send_response_to_data(struct session_ctx *sctx, struct session_data *sdata, char *rcptto);
+void process_written_file(struct session_ctx *sctx, struct session_data *sdata);
+void process_data(struct session_ctx *sctx, struct session_data *sdata);
 
 
-int handle_smtp_session(struct session_ctx *sctx, struct __config *cfg){
+int handle_smtp_session(struct session_ctx *sctx){
    int i, ret, pos, readpos=0, result, n, protocol_state, prevlen=0;
    char *p, buf[MAXBUFSIZE], puf[MAXBUFSIZE], resp[MAXBUFSIZE], prevbuf[MAXBUFSIZE], last2buf[2*MAXBUFSIZE+1];
    struct session_data sdata;
@@ -53,14 +53,14 @@ int handle_smtp_session(struct session_ctx *sctx, struct __config *cfg){
 
    protocol_state = SMTP_STATE_INIT;
 
-   init_session_data(&sdata, cfg);
+   init_session_data(&sdata, sctx->cfg);
    sdata.tls = 0;
 
 
    /* open database connection */
 
 #ifdef NEED_MYSQL
-   if(open_database(&sdata, cfg) == OK){
+   if(open_database(&sdata, sctx->cfg) == OK){
       sctx->db_conn = 1;
    }
    else
@@ -68,7 +68,7 @@ int handle_smtp_session(struct session_ctx *sctx, struct __config *cfg){
 #endif
 
    if(sctx->db_conn == 0){
-      snprintf(buf, MAXBUFSIZE-1, SMTP_RESP_421_ERR_TMP, cfg->hostid);
+      snprintf(buf, MAXBUFSIZE-1, SMTP_RESP_421_ERR_TMP, sctx->cfg->hostid);
       send(sctx->new_sd, buf, strlen(buf), 0);
       return 0;
    }
@@ -77,13 +77,13 @@ int handle_smtp_session(struct session_ctx *sctx, struct __config *cfg){
    gettimeofday(&tv1, &tz);
 
 #ifdef HAVE_LMTP
-   snprintf(buf, MAXBUFSIZE-1, LMTP_RESP_220_BANNER, cfg->hostid);
+   snprintf(buf, MAXBUFSIZE-1, LMTP_RESP_220_BANNER, sctx->cfg->hostid);
 #else
-   snprintf(buf, MAXBUFSIZE-1, SMTP_RESP_220_BANNER, cfg->hostid);
+   snprintf(buf, MAXBUFSIZE-1, SMTP_RESP_220_BANNER, sctx->cfg->hostid);
 #endif
 
    send(sctx->new_sd, buf, strlen(buf), 0);
-   if(cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: sent: %s", sdata.ttmpfile, buf);
+   if(sctx->cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: sent: %s", sdata.ttmpfile, buf);
 
    while((n = recvtimeoutssl(sctx->new_sd, &puf[readpos], sizeof(puf)-readpos, TIMEOUT, sdata.tls, sctx->data->ssl)) > 0){
          pos = 0;
@@ -105,7 +105,7 @@ int handle_smtp_session(struct session_ctx *sctx, struct __config *cfg){
 	       /* fix position */
                pos = pos - prevlen;
 
-               if(cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: period found", sdata.ttmpfile);
+               if(sctx->cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: period found", sdata.ttmpfile);
 
 
                /* write data only to (and including) the trailing period (.) */
@@ -115,7 +115,7 @@ int handle_smtp_session(struct session_ctx *sctx, struct __config *cfg){
                /* fix posistion! */
                pos += strlen(SMTP_CMD_PERIOD);
 
-               if(cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: got: (.)", sdata.ttmpfile);
+               if(sctx->cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: got: (.)", sdata.ttmpfile);
 
 
                protocol_state = SMTP_STATE_PERIOD;
@@ -148,7 +148,7 @@ int handle_smtp_session(struct session_ctx *sctx, struct __config *cfg){
                   goto AFTER_PERIOD;
                }
 
-               process_written_file(sctx, &sdata, cfg);
+               process_written_file(sctx, &sdata);
 
 
 
@@ -172,7 +172,7 @@ int handle_smtp_session(struct session_ctx *sctx, struct __config *cfg){
                   memset(puf+n-pos, 0, MAXBUFSIZE-n+pos);
                   recvtimeout(sctx->new_sd, buf, MAXBUFSIZE, TIMEOUT);
                   strncat(puf, buf, MAXBUFSIZE-1-n+pos);
-                  if(cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: partial read: %s", sdata.ttmpfile, puf);
+                  if(sctx->cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: partial read: %s", sdata.ttmpfile, puf);
                   pos = 0;
                }
 
@@ -198,14 +198,14 @@ AFTER_PERIOD:
       p = &puf[pos];
       readpos = 0;
 
-      if(cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: command=*%s*", sdata.ttmpfile, p);
+      if(sctx->cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: command=*%s*", sdata.ttmpfile, p);
 
       do {
          p = split(p, '\n', buf, sizeof(buf)-1, &result);
 
          if(result == 0){
             if(strlen(buf) > 0){
-               if(cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: partial read: *%s*", sdata.ttmpfile, buf);
+               if(sctx->cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: partial read: *%s*", sdata.ttmpfile, buf);
 
                snprintf(puf, sizeof(puf)-5, "%s", buf);
                readpos = strlen(puf);
@@ -214,10 +214,10 @@ AFTER_PERIOD:
             break;
          }
 
-         if(cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: got: %s", sdata.ttmpfile, buf);
+         if(sctx->cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: got: %s", sdata.ttmpfile, buf);
 
          if(strncasecmp(buf, SMTP_CMD_EHLO, strlen(SMTP_CMD_EHLO)) == 0 || strncasecmp(buf, LMTP_CMD_LHLO, strlen(LMTP_CMD_LHLO)) == 0){
-            process_command_ehlo_lhlo(&sdata, sctx->data, &protocol_state, &resp[0], sizeof(resp)-1, cfg);
+            process_command_ehlo_lhlo(sctx, &sdata, &protocol_state, &resp[0], sizeof(resp)-1);
             continue;
 
             /* FIXME: implement the ENHANCEDSTATUSCODE extensions */
@@ -231,14 +231,14 @@ AFTER_PERIOD:
          }
 
 
-         if(cfg->tls_enable > 0 && strncasecmp(buf, SMTP_CMD_STARTTLS, strlen(SMTP_CMD_STARTTLS)) == 0 && strlen(sctx->data->starttls) > 4 && sdata.tls == 0){
-            process_command_starttls(&sdata, sctx->data, &protocol_state, &starttls, sctx->new_sd, &resp[0], sizeof(resp)-1, cfg);
+         if(sctx->cfg->tls_enable > 0 && strncasecmp(buf, SMTP_CMD_STARTTLS, strlen(SMTP_CMD_STARTTLS)) == 0 && strlen(sctx->data->starttls) > 4 && sdata.tls == 0){
+            process_command_starttls(sctx, &sdata, &protocol_state, &starttls, &resp[0], sizeof(resp)-1);
             continue;
          }
 
 
          if(strncasecmp(buf, SMTP_CMD_MAIL_FROM, strlen(SMTP_CMD_MAIL_FROM)) == 0){
-            process_command_mail_from(&sdata, &protocol_state, buf, &resp[0], sizeof(resp)-1, cfg);
+            process_command_mail_from(&sdata, &protocol_state, buf, &resp[0], sizeof(resp)-1, sctx->cfg);
             continue;
          }
 
@@ -260,18 +260,18 @@ AFTER_PERIOD:
          }
 
 
-         if(cfg->enable_chunking == 1 && strncasecmp(buf, SMTP_CMD_BDAT, strlen(SMTP_CMD_BDAT)) == 0){
+         if(sctx->cfg->enable_chunking == 1 && strncasecmp(buf, SMTP_CMD_BDAT, strlen(SMTP_CMD_BDAT)) == 0){
 
             process_command_bdat(sctx, &sdata, &protocol_state, buf, &resp[0], sizeof(resp)-1);
 
             if(protocol_state == SMTP_STATE_BDAT){
 
                for(i=0; i<sctx->bdat_rounds-1; i++){
-                  if(cfg->verbosity >= _LOG_DEBUG) syslog(LOG_INFO, "%s: sending bdat response (%d)", sdata.ttmpfile, i);
+                  if(sctx->cfg->verbosity >= _LOG_DEBUG) syslog(LOG_INFO, "%s: sending bdat response (%d)", sdata.ttmpfile, i);
                   write1(sctx->new_sd, "250 octets received\r\n", strlen("250 octets received\r\n"), sdata.tls, sctx->data->ssl);
                }
 
-               process_written_file(sctx, &sdata, cfg);
+               process_written_file(sctx, &sdata);
 
                unlink(sdata.ttmpfile);
                unlink(sdata.tmpframe);
@@ -282,7 +282,7 @@ AFTER_PERIOD:
 
 
          if(strncasecmp(buf, SMTP_CMD_QUIT, strlen(SMTP_CMD_QUIT)) == 0){
-            process_command_quit(&sdata, &protocol_state, &resp[0], sizeof(resp)-1, cfg);
+            process_command_quit(&sdata, &protocol_state, &resp[0], sizeof(resp)-1, sctx->cfg);
             continue;
          }
 
@@ -294,7 +294,7 @@ AFTER_PERIOD:
 
 
          if(strncasecmp(buf, SMTP_CMD_RESET, strlen(SMTP_CMD_RESET)) == 0){
-            process_command_reset(&sdata, &protocol_state, &resp[0], sizeof(resp)-1, cfg);
+            process_command_reset(&sdata, &protocol_state, &resp[0], sizeof(resp)-1, sctx->cfg);
             continue;
          }
 
@@ -307,7 +307,7 @@ AFTER_PERIOD:
 
 
       if(strlen(resp) > 0){
-         send_buffered_response(&sdata, sctx->data, starttls, sctx->new_sd, &resp[0], cfg);
+         send_buffered_response(sctx, &sdata, starttls, &resp[0]);
          memset(resp, 0, sizeof(resp));
       }
 
@@ -324,10 +324,10 @@ AFTER_PERIOD:
     */
 
    if(protocol_state < SMTP_STATE_QUIT && sctx->inj == ERR){
-      snprintf(buf, MAXBUFSIZE-1, SMTP_RESP_421_ERR, cfg->hostid);
+      snprintf(buf, MAXBUFSIZE-1, SMTP_RESP_421_ERR, sctx->cfg->hostid);
       write1(sctx->new_sd, buf, strlen(buf), sdata.tls, sctx->data->ssl);
 
-      if(cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: sent: %s", sdata.ttmpfile, buf);
+      if(sctx->cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: sent: %s", sdata.ttmpfile, buf);
 
       if(sdata.fd != -1){
 
@@ -344,7 +344,7 @@ AFTER_PERIOD:
 
 QUITTING:
 
-   update_counters(&sdata, sctx->data, sctx->counters, cfg);
+   update_counters(&sdata, sctx->data, sctx->counters, sctx->cfg);
 
 #ifdef NEED_MYSQL
    close_database(&sdata);
@@ -355,7 +355,7 @@ QUITTING:
       SSL_free(sctx->data->ssl);
    }
 
-   if(cfg->verbosity >= _LOG_INFO) syslog(LOG_PRIORITY, "processed %llu messages", sctx->counters->c_rcvd);
+   if(sctx->cfg->verbosity >= _LOG_INFO) syslog(LOG_PRIORITY, "processed %llu messages", sctx->counters->c_rcvd);
 
    return (int)sctx->counters->c_rcvd;
 }
@@ -381,7 +381,7 @@ int is_blocked_by_tcp_wrappers(int sd){
 #endif
 
 
-void process_written_file(struct session_ctx *sctx, struct session_data *sdata, struct __config *cfg){
+void process_written_file(struct session_ctx *sctx, struct session_data *sdata){
    int i;
    char *rcpt;
    char delay[SMALLBUFSIZE], tmpbuf[SMALLBUFSIZE];
@@ -393,15 +393,15 @@ void process_written_file(struct session_ctx *sctx, struct session_data *sdata,
 
    sctx->data->folder = 0;
 
-   parser_state = parse_message(sdata, 1, sctx->data, cfg);
-   post_parse(sdata, &parser_state, cfg);
+   parser_state = parse_message(sdata, 1, sctx->data, sctx->cfg);
+   post_parse(sdata, &parser_state, sctx->cfg);
 
    sctx->parser_state = &parser_state;
 
    gettimeofday(&tv2, &tz);
    sdata->__parsed = tvdiff(tv2, tv1);
 
-   if(cfg->syslog_recipients == 1){
+   if(sctx->cfg->syslog_recipients == 1){
       rcpt = parser_state.b_to;
       do {
          rcpt = split_str(rcpt, " ", tmpbuf, sizeof(tmpbuf)-1);
@@ -412,9 +412,9 @@ void process_written_file(struct session_ctx *sctx, struct session_data *sdata,
       } while(rcpt);
    }
 
-   if(cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: parsed message", sdata->ttmpfile);
+   if(sctx->cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: parsed message", sdata->ttmpfile);
 
-   if(cfg->archive_only_mydomains == 1 && sdata->internal_sender == 0 && sdata->internal_recipient == 0){
+   if(sctx->cfg->archive_only_mydomains == 1 && sdata->internal_sender == 0 && sdata->internal_recipient == 0){
       remove_stripped_attachments(&parser_state);
       sctx->inj = ERR_MYDOMAINS;
 
@@ -426,11 +426,11 @@ void process_written_file(struct session_ctx *sctx, struct session_data *sdata,
       return;
    }
 
-   make_digests(sdata, cfg);
+   make_digests(sdata, sctx->cfg);
 
 #ifdef HAVE_ANTIVIRUS
-   if(cfg->use_antivirus == 1){
-      sdata->rav = do_av_check(sdata, &virusinfo[0], sctx->data, cfg);
+   if(sctx->cfg->use_antivirus == 1){
+      sdata->rav = do_av_check(sdata, &virusinfo[0], sctx->data, sctx->cfg);
    }
 #endif
 
@@ -440,11 +440,11 @@ void process_written_file(struct session_ctx *sctx, struct session_data *sdata,
 #else
    i = 0;
 #endif
-      if(cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: round %d in injection", sdata->ttmpfile, i);
+      if(sctx->cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: round %d in injection", sdata->ttmpfile, i);
 
-      process_data(sctx, sdata, cfg);
+      process_data(sctx, sdata);
 
-      send_response_to_data(sctx, sdata, sdata->rcptto[i], cfg);
+      send_response_to_data(sctx, sdata, sdata->rcptto[i]);
 
 
       snprintf(delay, SMALLBUFSIZE-1, "delay=%.2f, delays=%.2f/%.2f/%.2f/%.2f/%.2f/%.2f",
@@ -467,7 +467,7 @@ void process_written_file(struct session_ctx *sctx, struct session_data *sdata,
 }
 
 
-void process_data(struct session_ctx *sctx, struct session_data *sdata, struct __config *cfg){
+void process_data(struct session_ctx *sctx, struct session_data *sdata){
    char *arule = NULL;
    char virusinfo[SMALLBUFSIZE];
 
@@ -480,7 +480,7 @@ void process_data(struct session_ctx *sctx, struct session_data *sdata, struct _
          syslog(LOG_PRIORITY, "%s: discarding: restored copy", sdata->ttmpfile);
          sctx->inj = OK;
       }
-      else if(sdata->tot_len < cfg->min_message_size){
+      else if(sdata->tot_len < sctx->cfg->min_message_size){
          syslog(LOG_PRIORITY, "%s: discarding: too short message (%d bytes)", sdata->ttmpfile, sdata->tot_len);
          sctx->inj = OK;
       }
@@ -492,7 +492,7 @@ void process_data(struct session_ctx *sctx, struct session_data *sdata, struct _
          syslog(LOG_PRIORITY, "%s: invalid digest", sdata->ttmpfile);
          sctx->inj = ERR;
       } else {
-         if(cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: processing message", sdata->ttmpfile);
+         if(sctx->cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: processing message", sdata->ttmpfile);
 
          /* check message against archiving rules */
 
@@ -508,7 +508,7 @@ void process_data(struct session_ctx *sctx, struct session_data *sdata, struct _
             sctx->status = S_STATUS_DISCARDED;
          }
          else {
-            sctx->inj = process_message(sdata, sctx->parser_state, sctx->data, cfg);
+            sctx->inj = process_message(sdata, sctx->parser_state, sctx->data, sctx->cfg);
             unlink(sctx->parser_state->message_id_hash);
             sctx->counters->c_size += sdata->tot_len;
             sctx->counters->c_stored_size = sdata->stored_len;
@@ -522,7 +522,7 @@ void process_data(struct session_ctx *sctx, struct session_data *sdata, struct _
 }
 
 
-void send_response_to_data(struct session_ctx *sctx, struct session_data *sdata, char *rcptto, struct __config *cfg){
+void send_response_to_data(struct session_ctx *sctx, struct session_data *sdata, char *rcptto){
 
    /* set the accept buffer */
 
@@ -535,7 +535,7 @@ void send_response_to_data(struct session_ctx *sctx, struct session_data *sdata,
 
    write1(sctx->new_sd, sdata->acceptbuf, strlen(sdata->acceptbuf), sdata->tls, sctx->data->ssl);
 
-   if(cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: sent: %s", sdata->ttmpfile, sdata->acceptbuf);
+   if(sctx->cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: sent: %s", sdata->ttmpfile, sdata->acceptbuf);
 
    sctx->counters->c_rcvd++;
 
diff --git a/src/smtp.c b/src/smtp.c
index 2db719ee..fec2513c 100644
--- a/src/smtp.c
+++ b/src/smtp.c
@@ -20,7 +20,7 @@
 #include <smtp.h>
 
 
-void process_command_ehlo_lhlo(struct session_data *sdata, struct __data *data, int *protocol_state, char *resp, int resplen, struct __config *cfg){
+void process_command_ehlo_lhlo(struct session_ctx *sctx, struct session_data *sdata, int *protocol_state, char *resp, int resplen){
    char tmpbuf[MAXBUFSIZE];
    char extensions[SMALLBUFSIZE];
 
@@ -28,26 +28,26 @@ void process_command_ehlo_lhlo(struct session_data *sdata, struct __data *data,
 
    if(*protocol_state == SMTP_STATE_INIT) *protocol_state = SMTP_STATE_HELO;
 
-   if(sdata->tls == 0) snprintf(extensions, sizeof(extensions)-1, "%s", data->starttls);
-   if(cfg->enable_chunking == 1) strncat(extensions, SMTP_EXTENSION_CHUNKING, sizeof(extensions)-strlen(extensions)-2);
+   if(sdata->tls == 0) snprintf(extensions, sizeof(extensions)-1, "%s", sctx->data->starttls);
+   if(sctx->cfg->enable_chunking == 1) strncat(extensions, SMTP_EXTENSION_CHUNKING, sizeof(extensions)-strlen(extensions)-2);
 
-   snprintf(tmpbuf, sizeof(tmpbuf)-1, SMTP_RESP_250_EXTENSIONS, cfg->hostid, extensions);
+   snprintf(tmpbuf, sizeof(tmpbuf)-1, SMTP_RESP_250_EXTENSIONS, sctx->cfg->hostid, extensions);
 
    strncat(resp, tmpbuf, resplen-strlen(resp));
 }
 
 
-void process_command_starttls(struct session_data *sdata, struct __data *data, int *protocol_state, int *starttls, int new_sd, char *resp, int resplen, struct __config *cfg){
+void process_command_starttls(struct session_ctx *sctx, struct session_data *sdata, int *protocol_state, int *starttls, char *resp, int resplen){
 
-   if(cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: starttls request from client", sdata->ttmpfile);
+   if(sctx->cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: starttls request from client", sdata->ttmpfile);
 
-   if(data->ctx){
-      data->ssl = SSL_new(data->ctx);
-      if(data->ssl){
+   if(sctx->data->ctx){
+      sctx->data->ssl = SSL_new(sctx->data->ctx);
+      if(sctx->data->ssl){
 
-         SSL_set_options(data->ssl, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3);
+         SSL_set_options(sctx->data->ssl, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3);
 
-         if(SSL_set_fd(data->ssl, new_sd) == 1){
+         if(SSL_set_fd(sctx->data->ssl, sctx->new_sd) == 1){
             strncat(resp, SMTP_RESP_220_READY_TO_START_TLS, resplen);
             *starttls = 1;
             *protocol_state = SMTP_STATE_INIT;
@@ -255,29 +255,29 @@ void process_command_reset(struct session_data *sdata, int *protocol_state, char
 }
 
 
-void send_buffered_response(struct session_data *sdata, struct __data *data, int starttls, int new_sd, char *resp, struct __config *cfg){
+void send_buffered_response(struct session_ctx *sctx, struct session_data *sdata, int starttls, char *resp){
    int rc;
    char ssl_error[SMALLBUFSIZE];
 
-   write1(new_sd, resp, strlen(resp), sdata->tls, data->ssl);
+   write1(sctx->new_sd, resp, strlen(resp), sdata->tls, sctx->data->ssl);
 
-   if(cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: sent: %s", sdata->ttmpfile, resp);
+   if(sctx->cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: sent: %s", sdata->ttmpfile, resp);
    memset(resp, 0, MAXBUFSIZE);
 
    if(starttls == 1 && sdata->tls == 0){
 
-      if(cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: waiting for ssl handshake", sdata->ttmpfile);
+      if(sctx->cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: waiting for ssl handshake", sdata->ttmpfile);
 
-      rc = SSL_accept(data->ssl);
+      rc = SSL_accept(sctx->data->ssl);
 
-      if(cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: SSL_accept() finished", sdata->ttmpfile);
+      if(sctx->cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: SSL_accept() finished", sdata->ttmpfile);
 
       if(rc == 1){
          sdata->tls = 1;
       }
       else {
          ERR_error_string_n(ERR_get_error(), ssl_error, SMALLBUFSIZE);
-         syslog(LOG_PRIORITY, "%s: SSL_accept() failed, rc=%d, errorcode: %d, error text: %s\n", sdata->ttmpfile, rc, SSL_get_error(data->ssl, rc), ssl_error);
+         syslog(LOG_PRIORITY, "%s: SSL_accept() failed, rc=%d, errorcode: %d, error text: %s\n", sdata->ttmpfile, rc, SSL_get_error(sctx->data->ssl, rc), ssl_error);
       }
    }
 }
diff --git a/src/smtp.h b/src/smtp.h
index 56faa495..192b59f7 100644
--- a/src/smtp.h
+++ b/src/smtp.h
@@ -5,8 +5,8 @@
 #ifndef _SMTP_H
  #define _SMTP_H
 
-void process_command_ehlo_lhlo(struct session_data *sdata, struct __data *data, int *protocol_state, char *resp, int resplen, struct __config *cfg);
-void process_command_starttls(struct session_data *sdata, struct __data *data, int *protocol_state, int *starttls, int new_sd, char *resp, int resplen, struct __config *cfg);
+void process_command_ehlo_lhlo(struct session_ctx *sctx, struct session_data *sdata, int *protocol_state, char *resp, int resplen);
+void process_command_starttls(struct session_ctx *sctx, struct session_data *sdata, int *protocol_state, int *starttls, char *resp, int resplen);
 void process_command_mail_from(struct session_data *sdata, int *protocol_state, char *buf, char *resp, int resplen, struct __config *cfg);
 void process_command_rcpt_to(struct session_data *sdata, int *protocol_state, char *buf, char *resp, int resplen);
 void process_command_data(struct session_data *sdata, int *protocol_state, char *resp, int resplen);
@@ -17,6 +17,6 @@ void process_command_reset(struct session_data *sdata, int *protocol_state, char
 int read_bdat_data(struct session_ctx *sctx, struct session_data *sdata, int expected_bdat_len);
 int extract_bdat_command(struct session_ctx *sctx, struct session_data *sdata, char *buf);
 
-void send_buffered_response(struct session_data *sdata, struct __data *data, int starttls, int new_sd, char *resp, struct __config *cfg);
+void send_buffered_response(struct session_ctx *sctx, struct session_data *sdata, int starttls, char *resp);
 
 #endif /* _SMTP_H */