diff -urN exim-4.24.orig/build-Linux-i386/globals.c exim-4.24/build-Linux-i386/globals.c
--- exim-4.24.orig/build-Linux-i386/globals.c	Sat Oct  4 08:33:20 2003
+++ exim-4.24/build-Linux-i386/globals.c	Sat Oct  4 09:12:01 2003
@@ -443,6 +443,7 @@
 			"\0<---------------Space to patch exim_path->";
 uid_t   exim_uid               = EXIM_UID;
 BOOL    exim_uid_set           = TRUE;          /* This uid is always set */
+BOOL    exiscan_debug_keepfiles= FALSE;
 uschar *exiscan_version_string = US"??";
 int     expand_forbid          = 0;
 int     expand_nlength[EXPAND_MAXN+1];
diff -urN exim-4.24.orig/build-Linux-i386/globals.h exim-4.24/build-Linux-i386/globals.h
--- exim-4.24.orig/build-Linux-i386/globals.h	Sat Oct  4 08:33:20 2003
+++ exim-4.24/build-Linux-i386/globals.h	Sat Oct  4 09:12:40 2003
@@ -251,6 +251,7 @@
 extern uschar *exim_path;              /* Path to exec exim */
 extern uid_t   exim_uid;               /* Non-root uid for exim */
 extern BOOL    exim_uid_set;           /* TRUE if exim_uid set */
+extern BOOL    exiscan_debug_keepfiles;
 extern uschar *exiscan_version_string; /* Exiscan version string */
 extern int     expand_forbid;          /* RDO flags for forbidding things */
 extern int     expand_nlength[];       /* Lengths of numbered strings */
diff -urN exim-4.24.orig/build-Linux-i386/readconf.c exim-4.24/build-Linux-i386/readconf.c
--- exim-4.24.orig/build-Linux-i386/readconf.c	Sat Oct  4 08:33:20 2003
+++ exim-4.24/build-Linux-i386/readconf.c	Sat Oct  4 09:10:29 2003
@@ -190,6 +190,7 @@
   { "exim_group",               opt_gid,         &exim_gid },
   { "exim_path",                opt_stringptr,   &exim_path },
   { "exim_user",                opt_uid,         &exim_uid },
+  { "exiscan_debug_keepfiles",  opt_bool,        &exiscan_debug_keepfiles }, 
   { "extra_local_interfaces",   opt_stringptr,   &extra_local_interfaces },
   { "extract_addresses_remove_arguments", opt_bool, &extract_addresses_remove_arguments },
   { "finduser_retries",         opt_int,         &finduser_retries },
diff -urN exim-4.24.orig/build-Linux-i386/spool_mbox.c exim-4.24/build-Linux-i386/spool_mbox.c
--- exim-4.24.orig/build-Linux-i386/spool_mbox.c	Sat Oct  4 08:33:20 2003
+++ exim-4.24/build-Linux-i386/spool_mbox.c	Sat Oct  4 09:16:44 2003
@@ -18,6 +18,7 @@
 extern int malware_ok;
 extern int spam_ok;
 extern struct file_extension *file_extensions;
+extern BOOL exiscan_debug_keepfiles;
 
 int spool_mbox_ok = 0;
 
@@ -136,6 +137,7 @@
   
     spool_mbox_ok = 0;
     
+    if (!exiscan_debug_keepfiles) {
     snprintf(CS mbox_path, 1024, "%s/scan/%s", spool_directory, message_id);
   	
   	tempdir = opendir(CS mbox_path);
@@ -153,5 +155,6 @@
   	
   	/* remove directory */
   	n = rmdir(CS mbox_path);
+    }
   };
 }
diff -urN exim-4.24.orig/src/globals.c exim-4.24/src/globals.c
--- exim-4.24.orig/src/globals.c	Sat Oct  4 08:33:20 2003
+++ exim-4.24/src/globals.c	Sat Oct  4 09:12:01 2003
@@ -443,6 +443,7 @@
 			"\0<---------------Space to patch exim_path->";
 uid_t   exim_uid               = EXIM_UID;
 BOOL    exim_uid_set           = TRUE;          /* This uid is always set */
+BOOL    exiscan_debug_keepfiles= FALSE;
 uschar *exiscan_version_string = US"??";
 int     expand_forbid          = 0;
 int     expand_nlength[EXPAND_MAXN+1];
diff -urN exim-4.24.orig/src/globals.h exim-4.24/src/globals.h
--- exim-4.24.orig/src/globals.h	Sat Oct  4 08:33:20 2003
+++ exim-4.24/src/globals.h	Sat Oct  4 09:12:40 2003
@@ -251,6 +251,7 @@
 extern uschar *exim_path;              /* Path to exec exim */
 extern uid_t   exim_uid;               /* Non-root uid for exim */
 extern BOOL    exim_uid_set;           /* TRUE if exim_uid set */
+extern BOOL    exiscan_debug_keepfiles;
 extern uschar *exiscan_version_string; /* Exiscan version string */
 extern int     expand_forbid;          /* RDO flags for forbidding things */
 extern int     expand_nlength[];       /* Lengths of numbered strings */
diff -urN exim-4.24.orig/src/readconf.c exim-4.24/src/readconf.c
--- exim-4.24.orig/src/readconf.c	Sat Oct  4 08:33:20 2003
+++ exim-4.24/src/readconf.c	Sat Oct  4 09:10:29 2003
@@ -190,6 +190,7 @@
   { "exim_group",               opt_gid,         &exim_gid },
   { "exim_path",                opt_stringptr,   &exim_path },
   { "exim_user",                opt_uid,         &exim_uid },
+  { "exiscan_debug_keepfiles",  opt_bool,        &exiscan_debug_keepfiles }, 
   { "extra_local_interfaces",   opt_stringptr,   &extra_local_interfaces },
   { "extract_addresses_remove_arguments", opt_bool, &extract_addresses_remove_arguments },
   { "finduser_retries",         opt_int,         &finduser_retries },
diff -urN exim-4.24.orig/src/spool_mbox.c exim-4.24/src/spool_mbox.c
--- exim-4.24.orig/src/spool_mbox.c	Sat Oct  4 08:33:20 2003
+++ exim-4.24/src/spool_mbox.c	Sat Oct  4 09:16:44 2003
@@ -18,6 +18,7 @@
 extern int malware_ok;
 extern int spam_ok;
 extern struct file_extension *file_extensions;
+extern BOOL exiscan_debug_keepfiles;
 
 int spool_mbox_ok = 0;
 
@@ -136,6 +137,7 @@
   
     spool_mbox_ok = 0;
     
+    if (!exiscan_debug_keepfiles) {
     snprintf(CS mbox_path, 1024, "%s/scan/%s", spool_directory, message_id);
   	
   	tempdir = opendir(CS mbox_path);
@@ -153,5 +155,6 @@
   	
   	/* remove directory */
   	n = rmdir(CS mbox_path);
+    }
   };
 }