diff --git a/clamav-devel/ChangeLog b/clamav-devel/ChangeLog
index 80b18bc76..1eba9f862 100644
--- a/clamav-devel/ChangeLog
+++ b/clamav-devel/ChangeLog
@@ -1,3 +1,8 @@
+Thu Sep 16 11:07:37 BST 2004 (njh)
+----------------------------------
+  * libclamav/mbox:c	If a false or invented encoding type is stated attempt
+				to decode with all known decoders
+
 Thu Sep 16 09:58:01 BST 2004 (njh)
 ----------------------------------
   * libclamav/mbox.c:	Handle comments in the headers
@@ -51,7 +56,7 @@ Tue Sep 14 22:32:50 CEST 2004 (tk)
 
 Tue Sep 14 13:10:38 BST 2004 (njh)
 ----------------------------------
-  * libclamav/mbox.c:	FOLLOWURL: include the text of the old HTML 
+  * libclamav/mbox.c:	FOLLOWURL: include the text of the old HTML
 				normalisation code that works in RAM until the
 				code for the new HTML API that uses temporary
 				files is added to mbox.c. This allows clamAV to
diff --git a/clamav-devel/libclamav/message.c b/clamav-devel/libclamav/message.c
index 940c4f842..f5dd480aa 100644
--- a/clamav-devel/libclamav/message.c
+++ b/clamav-devel/libclamav/message.c
@@ -17,6 +17,9 @@
  *
  * Change History:
  * $Log: message.c,v $
+ * Revision 1.79  2004/09/16 10:05:59  nigelhorne
+ * Use default decoders
+ *
  * Revision 1.78  2004/09/15 18:08:23  nigelhorne
  * Handle multiple encoding types
  *
@@ -231,7 +234,7 @@
  * uuencodebegin() no longer static
  *
  */
-static	char	const	rcsid[] = "$Id: message.c,v 1.78 2004/09/15 18:08:23 nigelhorne Exp $";
+static	char	const	rcsid[] = "$Id: message.c,v 1.79 2004/09/16 10:05:59 nigelhorne Exp $";
 
 #if HAVE_CONFIG_H
 #include "clamav-config.h"
@@ -859,8 +862,8 @@ messageSetEncoding(message *m, const char *enctype)
 			 * Err on the side of safety, enable all decoding
 			 * modules
 			 */
-			/*messageSetEncoding(m, "base64");
-			messageSetEncoding(m, "quoted-printable");*/
+			messageSetEncoding(m, "base64");
+			messageSetEncoding(m, "quoted-printable");
 			break;
 		}
 
diff --git a/clamav-devel/libclamav/strrcpy.c b/clamav-devel/libclamav/strrcpy.c
index 88b93aad0..64d2ff95d 100644
--- a/clamav-devel/libclamav/strrcpy.c
+++ b/clamav-devel/libclamav/strrcpy.c
@@ -19,6 +19,8 @@
 #include <stdio.h>
 #include <assert.h>
 
+#include "strrcpy.h"
+
 /*
  * Like strcpy, but return the END of the destination, allowing a quicker
  * means of adding to the end of a string than strcat
diff --git a/clamav-devel/libclamav/strrcpy.h b/clamav-devel/libclamav/strrcpy.h
index e035f44ce..2fa8a60ce 100644
--- a/clamav-devel/libclamav/strrcpy.h
+++ b/clamav-devel/libclamav/strrcpy.h
@@ -20,5 +20,7 @@
 
 #ifndef __STRRCPY_H
 #define __STRRCPY_H
-    char *strrcpy(char *dest, const char *source);
+
+char	*strrcpy(char *dest, const char *source);
+
 #endif