diff --git a/app/Controllers/ThzController.php b/app/Controllers/ThzController.php
index 9d778ca9..4a754a94 100644
--- a/app/Controllers/ThzController.php
+++ b/app/Controllers/ThzController.php
@@ -144,9 +144,6 @@ class ThzController extends BaseController
 
 
             $data = $this->request->getGet();
-            if ($returnType === 'web' && in_array(get_role_id(), [2, 3, 4])) {
-                $data['assign_to'] = $data['assign_to'] ?? get_session_userid();
-            }
 
             $tickets = $this->fetchTicketsBasedOnrole($data);
 
@@ -159,8 +156,9 @@ class ThzController extends BaseController
                 }
             } else {
                 $data['ticket_data'] = $tickets;
-                $data['assignee'] = $this->userModel->where('is_active', 1)->whereIn('role', ['2', '3', '4'])->findAll(); // enga 5-"head" and 1-"admin" assign pannvaga so dropdown la varakudhathu 
-                // 2,3,4 remain person varannum. 
+                $data['assignee'] = $this->userModel->where('is_active', 1)->whereIn('role', ['3', '4'])->findAll(); 
+                // enga 5-"head" and 1-"admin" assign pannvaga so dropdown la varakudhathu  , 2-"manager l2 " - ivangalum  assign pannalam
+                // 3,4 remain person varannum. 
                 $data['client_list'] = $this->clientModel->getCreatedByUserName();
                 $data['ticket_type'] = $this->thzTypeModel->where('is_active', 1)->findAll();
 
@@ -544,9 +542,9 @@ 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;
     }
@@ -681,7 +679,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] ?? [];
@@ -703,7 +701,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']);