@@ -126,6 +126,7 @@ static const struct ftmap_s {

     { "CL_TYPE_XML_HWP",	CL_TYPE_XML_HWP		},

     { "CL_TYPE_HWPOLE2",	CL_TYPE_HWPOLE2		},

     { "CL_TYPE_OOXML_HWP",	CL_TYPE_OOXML_HWP	},

+    { "CL_TYPE_MHTML",		CL_TYPE_MHTML		},

     { NULL,			CL_TYPE_IGNORED		}

 };

@@ -114,6 +114,7 @@ typedef enum {

     CL_TYPE_XML_XL,

     CL_TYPE_XML_HWP,

     CL_TYPE_HWPOLE2,

+    CL_TYPE_MHTML,

     CL_TYPE_OTHER, /* on-the-fly, used for target 14 (OTHER) */

     CL_TYPE_IGNORED /* please don't add anything below */

@@ -193,6 +193,8 @@ static const char *ftypes_int[] = {

   "0:4:d0cf11e0a1b11ae1:HWP embedded OLE2:CL_TYPE_ANY:CL_TYPE_HWPOLE2",

   "0:0:48575020446f63756d656e742046696c652056332e3030201a0102030405:HWP 3.x Document:CL_TYPE_ANY:CL_TYPE_HWP3:82",

   "1:0:efbbbf3c3f786d6c2076657273696f6e3d22312e3022*3c4857504d4c:HWPML Document:CL_TYPE_ANY:CL_TYPE_XML_HWP:82",

+  "1:0:(4d|6d)(49|69)(4d|6d)(45|65)2d(56|76)657273696f6e3a20{-1024}0a(43|63)6f6e74656e742d(54|74)7970653a20:MHTML file:CL_TYPE_ANY:CL_TYPE_MHTML:83",

+  "1:*:0a(4d|6d)(49|69)(4d|6d)(45|65)2d(56|76)657273696f6e3a20{-1024}0a(43|63)6f6e74656e742d(54|74)7970653a20:MHTML file:CL_TYPE_ANY:CL_TYPE_MHTML:83",

   NULL

 };

@@ -2268,6 +2268,14 @@ static int cli_scanraw(cli_ctx *ctx, cli_file_t type, uint8_t typercg, cli_file_

         while(fpt) {

             if(fpt->offset) switch(fpt->type) {

+                case CL_TYPE_MHTML:

+                    ctx->container_type = CL_TYPE_MHTML;

+                    if(SCAN_MAIL && (DCONF_MAIL & MAIL_CONF_MBOX)) {

+                        cli_dbgmsg("MHTML signature found at %u\n", (unsigned int) fpt->offset);

+                        ret = cli_scanmail(ctx);

+                    }

+                    break;

+

                 case CL_TYPE_XDP:

                     if(SCAN_PDF && (DCONF_DOC & DOC_CONF_PDF)) {

                         cli_dbgmsg("XDP signature found at %u\n", (unsigned int) fpt->offset);

@@ -3027,6 +3035,12 @@ static int magic_scandesc(cli_ctx *ctx, cli_file_t type)

 		ret = cli_scanmail(ctx);

 	    break;

+	case CL_TYPE_MHTML:

+	    ctx->container_type = CL_TYPE_MHTML;

+	    if(SCAN_MAIL && (DCONF_MAIL & MAIL_CONF_MBOX))

+		ret = cli_scanmail(ctx);

+	    break;

+

 	case CL_TYPE_TNEF:

 	    if(SCAN_MAIL && (DCONF_MAIL & MAIL_CONF_TNEF))

 		ret = cli_scantnef(ctx);