diff --git a/python/mailserver.py b/python/mailserver.py
index 962ae7f..0971317 100644
--- a/python/mailserver.py
+++ b/python/mailserver.py
@@ -135,6 +135,7 @@ class CustomSMTPServer(smtpd.SMTPServer):
                     json.dump(savedata, outfile)
 
             #print edata
+            cleanup()
         return
 
 if __name__ == '__main__':
@@ -159,9 +160,6 @@ if __name__ == '__main__':
         if("CLEANUP" in Config.sections() and "delete_older_than_days" in Config.options("CLEANUP")):
             DELETE_OLDER_THAN_DAYS = (Config.get("CLEANUP","DELETE_OLDER_THAN_DAYS").lower() == "true")    
 
-    cleanup()
-    quit()
-
     print "[i] Starting Mailserver on port",port
 
     server = CustomSMTPServer(('0.0.0.0', port), None) # use your public IP here