diff --git a/app/Controllers/ThzController.php b/app/Controllers/ThzController.php
index d37fc2cc..f88854d2 100644
--- a/app/Controllers/ThzController.php
+++ b/app/Controllers/ThzController.php
@@ -542,10 +542,13 @@ class ThzController extends BaseController
 
         $ticketId       = $thz_id;
 
-        $message        = $data['notes'] ?? '';
+        //        $message        = $data['notes'] ?? '';
 
         $this->sendEmail($templateName, $data, $to_email, $ticketId, $message);
 
+
+        $this->sendEmail($templateName, $data, $to_email, $ticketId);
+
         return true;
     }
 
@@ -679,7 +682,7 @@ class ThzController extends BaseController
     }
 
 
-    private function sendEmail($templateName, $data, $to_email, $ticketId , $cc = "",  $message = "", $bcc = "")
+    private function sendEmail($templateName, $data, $to_email, $ticketId , $cc = "", $bcc = "")
     {
 
         $mailTemplate    =  $this->ticketMailTemplateModel->where('template_name', $templateName)->findAll()[0] ?? [];
@@ -701,7 +704,7 @@ class ThzController extends BaseController
 
         $mailTemplate['mail_content'] = str_replace('%ticketId%', $ticketId ?? '', $mailTemplate['mail_content']);
 
-        $mailTemplate['mail_content'] = str_replace('%message%', $message ?? '', $mailTemplate['mail_content']);
+        $mailTemplate['mail_content'] = str_replace('%message%', $data['notes'] ?? '', $mailTemplate['mail_content']);
 
         $mailTemplate['mail_content'] = str_replace('%assignee_email%', $data['assignee_email'] ?? '', $mailTemplate['mail_content']);