diff --git a/libclamav/msg.c b/libclamav/msg.c
index e0558b2eb..48c76c61f 100644
--- a/libclamav/msg.c
+++ b/libclamav/msg.c
@@ -17,12 +17,13 @@
  *  MA 02110-1301, USA.
  */
 #include "clamav.h"
-#include "others.h"
 #include "msg.h"
 
 int
 cli_msg(const char *dir, int desc, const cli_ctx *ctx)
 {
-	cli_warnmsg("MSG files not yet supported\n");
-	return CL_EFORMAT;
+	/*cli_warnmsg("MSG files not yet supported\n");
+	return CL_EFORMAT;*/
+	cli_dbgmsg("cli_msg: treat as OLE2 document for now\n");
+	return cli_ole2_extract(desc, dir, ctx->limits);
 }
diff --git a/libclamav/msg.h b/libclamav/msg.h
index 8d24da2ec..20431bbc2 100644
--- a/libclamav/msg.h
+++ b/libclamav/msg.h
@@ -20,6 +20,9 @@
 #ifndef __MSG_H
 #define __MSG_H
 
+#include "others.h"
+#include "ole2_extract.h"
+
 int cli_msg(const char *dir, int desc, const cli_ctx *ctx);
 
 #endif