diff --git a/app/Controllers/TicketController.php b/app/Controllers/TicketController.php
index c01192c9..b3607027 100644
--- a/app/Controllers/TicketController.php
+++ b/app/Controllers/TicketController.php
@@ -2321,8 +2321,8 @@ class TicketController extends BaseController
             ->findAll();
 
         foreach ($dataToSend['messages'] as &$message) {
-            $mail_content_converted = $this->convertHtmlToText($message['mail_content']);
-            $message['mail_content'] = $mail_content_converted;
+            // $mail_content_converted = $this->convertHtmlToText($message['mail_content']);
+            // $message['mail_content'] = $mail_content_converted;
 
             $claimFiles = new ClaimFilesModel();
             $message["files_data"] = $claimFiles->where('is_active', 1)
diff --git a/app/Views/claim_files_upload.php b/app/Views/claim_files_upload.php
index 4a86c1bd..84597f2f 100644
--- a/app/Views/claim_files_upload.php
+++ b/app/Views/claim_files_upload.php
@@ -164,6 +164,21 @@
 
 <script>
 
+    const MAX_UPLOAD_PAYLOAD_BYTES = 25 * 1024 * 1024; // 25 MB
+
+    function getSelectedUploadPayloadSize() {
+        let totalBytes = 0;
+        $('#drive_file_upload_form input[type=file]').each(function () {
+            if (!this.files || !this.files.length) {
+                return;
+            }
+            for (let i = 0; i < this.files.length; i++) {
+                totalBytes += this.files[i].size || 0;
+            }
+        });
+        return totalBytes;
+    }
+
     $(document).ready(function(){
         let ticket_id = $('#ticket_master_id').val();
         $('#ticket_id_url').val(ticket_id);
@@ -203,6 +218,12 @@
             return;
         }
 
+        const selectedPayloadBytes = getSelectedUploadPayloadSize();
+        if (selectedPayloadBytes > MAX_UPLOAD_PAYLOAD_BYTES) {
+            toastr.warning('Total selected file size must not exceed 25 MB.', 'Validation');
+            return;
+        }
+
         form_action = '<?php echo base_url() . 'ticket/upload_url' ?>';
 
         $('.loader').fadeIn();