diff --git a/src/session.c b/src/session.c
index 94fc9b5..c3e15bf 100644
--- a/src/session.c
+++ b/src/session.c
@@ -83,11 +83,6 @@
             memcpy(last2buf+prevlen, puf, MAXBUFSIZE);
 
 
-            /*if(sdata.hdr_len == 0){
-               sdata.hdr_len = searchStringInBuffer(last2buf, 2*MAXBUFSIZE+1, "\n\r\n", 3);
-               if(sdata.hdr_len == 0) searchStringInBuffer(last2buf, 2*MAXBUFSIZE+1, "\n\n", 2);
-            }*/
-
             pos = searchStringInBuffer(last2buf, 2*MAXBUFSIZE+1, SMTP_CMD_PERIOD, 5);
             if(pos > 0){
 
@@ -455,6 +450,15 @@
       send(new_sd, buf, strlen(buf), 0);
       if(cfg->verbosity >= _LOG_DEBUG) syslog(LOG_PRIORITY, "%s: sent: %s", sdata.ttmpfile, buf);
 
+      if(sdata.fd != -1){
+
+         syslog(LOG_PRIORITY, "%s: removing stale files: %s, %s", sdata.ttmpfile, sdata.ttmpfile, sdata.tmpframe);
+
+         close(sdata.fd);
+         unlink(sdata.ttmpfile);
+         unlink(sdata.tmpframe);
+      }
+
       goto QUITTING;
    }