diff --git a/application/MailtemplateDispatch/MailtemplateDispatch.php b/application/MailtemplateDispatch/MailtemplateDispatch.php
index e5e3f0470..06dbdfc94 100644
--- a/application/MailtemplateDispatch/MailtemplateDispatch.php
+++ b/application/MailtemplateDispatch/MailtemplateDispatch.php
@@ -61,10 +61,15 @@ class MailtemplateDispatch extends mfBaseModel {
 
             $email = new Emailnotification();
             $email->setSubject($subject);
-            $email->setBody($body);
+            if($this->getProperty("mailtemplate")->body_html) {
+                $email->setHtmlBody($body);
+            } else {
+                $email->setBody($body);
+            }
+
             $email->setFrom($from_email, $from_name);
             $email->setTo($to);
-            $email->setHeader("X-".ucfirst(MFAPPNAME)."-mnid", $this->id);
+            $email->setHeader("X-".ucfirst(MFAPPNAME)."-mtdid", $this->id);
             if(count($attachments)) {
                 foreach($attachments as $file) {
                     $email->addAttachment($file["path"], null, $file["filename"], $file['mimetype']);