diff --git a/clamav-devel/ChangeLog b/clamav-devel/ChangeLog
index 15fb95a0f..fc6171ba6 100644
--- a/clamav-devel/ChangeLog
+++ b/clamav-devel/ChangeLog
@@ -1,3 +1,11 @@
+Wed Jun  2 22:12:08 CEST 2004 (tk)
+----------------------------------
+  * freshclam: + allow spaces in HTTPProxyUsername (requested by SL
+	         <milter*free.fr>)
+	       + ignore freshclam.conf permissions under Cygwin (Alch
+	         <alch*users.sourceforge.net>)
+  * libclamav: detect more mail file types
+
 Wed Jun  2 14:15:54 BST 2004 (trog)
 -----------------------------------
   * libclamav/vba_extract.c: Fix possible crash
diff --git a/clamav-devel/clamscan/manager.c b/clamav-devel/clamscan/manager.c
index 18f3a49b1..430009c4e 100644
--- a/clamav-devel/clamscan/manager.c
+++ b/clamav-devel/clamscan/manager.c
@@ -67,7 +67,7 @@ int scanmanager(const struct optstruct *opt)
 	struct cl_limits *limits = NULL;
 	struct passwd *user = NULL;
 	struct stat sb;
-	char *fullpath = NULL, cwd[200];
+	char *fullpath = NULL, cwd[1024];
 	struct cfgstruct *copt, *cpt;
 	struct cl_cvd *d1, *d2;
 	const char *dbdir;
@@ -204,7 +204,7 @@ int scanmanager(const struct optstruct *opt)
     if(opt->filename == NULL || strlen(opt->filename) == 0) {
 
 	/* we need full path for some reasons (eg. archive handling) */
-	if(!getcwd(cwd, 200)) {
+	if(!getcwd(cwd, sizeof(cwd))) {
 	    mprintf("@Can't get absolute pathname of current working directory.\n");
 	    ret = 57;
 	} else
@@ -287,7 +287,7 @@ int scanmanager(const struct optstruct *opt)
 
 		if(compression && (thefilename[0] != '/')) {
 		    /* we need to complete the path */
-		    if(!getcwd(cwd, 200)) {
+		    if(!getcwd(cwd, sizeof(cwd))) {
 			mprintf("@Can't get absolute pathname of current working directory.\n");
 			return 57;
 		    } else {
diff --git a/clamav-devel/freshclam/freshclam.c b/clamav-devel/freshclam/freshclam.c
index bb7b89ab5..2ed3799cc 100644
--- a/clamav-devel/freshclam/freshclam.c
+++ b/clamav-devel/freshclam/freshclam.c
@@ -128,11 +128,12 @@ int freshclam(struct optstruct *opt)
 	    mprintf("@Can't stat %s (critical error)\n");
 	    return 56;
 	}
-
+#ifndef C_CYGWIN
 	if(statbuf.st_mode & (S_IRGRP | S_IWGRP | S_IXGRP | S_IROTH | S_IWOTH | S_IXOTH)) {
 	    mprintf("@Insecure permissions (for HTTPProxyPassword): %s must have no more than 0700 permissions.\n", cfgfile);
 	    return 56;
 	}
+#endif
     }
 
 #ifndef C_CYGWIN
diff --git a/clamav-devel/libclamav/scanners.c b/clamav-devel/libclamav/scanners.c
index 1b0dc784c..6fddaa437 100644
--- a/clamav-devel/libclamav/scanners.c
+++ b/clamav-devel/libclamav/scanners.c
@@ -98,6 +98,7 @@ static const struct cli_magic_s cli_magic[] = {
     {0,  "X-UIDL: ",			 8, "Mail",		  CL_MAILFILE},
     {0,  "X-Apparently-To: ",		17, "Mail",		  CL_MAILFILE},
     {0,  "X-Envelope-From: ",		17, "Mail",		  CL_MAILFILE},
+    {0,  "X-Original-To: ",		15, "Mail",		  CL_MAILFILE},
     {0,  "X-Symantec-",			11, "Symantec",		  CL_MAILFILE},
     {0,  "X-EVS",			 5, "EVS mail",		  CL_MAILFILE},
     {0,  ">From ",			 6, "Mail",		  CL_MAILFILE},
diff --git a/clamav-devel/shared/cfgparser.c b/clamav-devel/shared/cfgparser.c
index 3e84fb3cc..ccae23174 100644
--- a/clamav-devel/shared/cfgparser.c
+++ b/clamav-devel/shared/cfgparser.c
@@ -109,7 +109,7 @@ struct cfgstruct *parsecfg(const char *cfgfile)
 	    {"MaxAttempts", OPT_NUM}, /* freshclam */
 	    {"HTTPProxyServer", OPT_STR}, /* freshclam */
 	    {"HTTPProxyPort", OPT_NUM}, /* freshclam */
-	    {"HTTPProxyUsername", OPT_STR}, /* freshclam */
+	    {"HTTPProxyUsername", OPT_FULLSTR}, /* freshclam */
 	    {"HTTPProxyPassword", OPT_STR}, /* freshclam */
 	    {"NotifyClamd", OPT_OPTARG}, /* freshclam */
 	    {"OnUpdateExecute", OPT_FULLSTR}, /* freshclam */