diff --git a/cron_ticket_email_parser.php b/cron_ticket_email_parser.php
index fd930d14..a1832206 100644
--- a/cron_ticket_email_parser.php
+++ b/cron_ticket_email_parser.php
@@ -80,7 +80,13 @@ function addTicket($contact_id, $contact_name, $contact_email, $client_id, $date
     $new_config_ticket_next_number = $ticket_number + 1;
     mysqli_query($mysqli, "UPDATE settings SET config_ticket_next_number = $new_config_ticket_next_number WHERE company_id = 1");
 
-    $message = "<i>Email from: $contact_email at $date:-</i> <br><br>$message";
+    // Clean up the message
+    $message = trim($message); // Remove leading/trailing whitespace
+    $message = preg_replace('/\s+/', ' ', $message); // Replace multiple spaces with a single space
+    $message = nl2br($message); // Convert newlines to <br>
+    
+    // Wrap the message in a div with controlled line height
+    $message = "<i>Email from: $contact_email at $date:-</i> <br><br><div style='line-height:1.5;'>$message</div>";
 
     $ticket_prefix_esc = mysqli_real_escape_string($mysqli, $config_ticket_prefix);
     $subject_esc = mysqli_real_escape_string($mysqli, $subject);
@@ -146,7 +152,7 @@ function addTicket($contact_id, $contact_name, $contact_email, $client_id, $date
         $client_name = sanitizeInput($client_row['client_name']);
 
         $email_subject = "$config_app_name - New Ticket - $client_name: $subject";
-        $email_body = "Hello, <br><br>This is a notification that a new ticket has been raised in ITFlow. <br>Client: $client_name<br>Priority: Low (email parsed)<br>Link: https://$config_base_url/ticket.php?ticket_id=$id <br><br>--------------------------------<br><br><b>$subject</b><br>$details";
+        $email_body = "Hello, <br><br>This is a notification that a new ticket has been raised in ITFlow. <br>Client: $client_name<br>Priority: Low (email parsed)<br>Link: https://$config_base_url/ticket.php?ticket_id=$id <br><br>--------------------------------<br><br><b>$subject</b><br>$message";
 
         $data[] = [
             'from' => $config_ticket_from_email,
@@ -168,9 +174,16 @@ function addReply($from_email, $date, $subject, $ticket_number, $message, $attac
     global $mysqli, $config_app_name, $company_name, $company_phone, $config_ticket_prefix, $config_base_url, $config_ticket_from_name, $config_ticket_from_email, $config_smtp_host, $config_smtp_port, $config_smtp_encryption, $config_smtp_username, $config_smtp_password, $allowed_extensions;
 
     $ticket_reply_type = 'Client';
-    $message = explode("##- Please type your reply above this line -##", $message);
-    $message = nl2br($message[0]);
-    $message = "<i>Email from: $from_email at $date:-</i> <br><br>$message";
+    
+    // Clean up the message
+    $message_parts = explode("##- Please type your reply above this line -##", $message);
+    $message_body = $message_parts[0];
+    $message_body = trim($message_body); // Remove leading/trailing whitespace
+    $message_body = preg_replace('/\s+/', ' ', $message_body); // Replace multiple spaces with a single space
+    $message_body = nl2br($message_body); // Convert newlines to <br>
+    
+    // Wrap the message in a div with controlled line height
+    $message = "<i>Email from: $from_email at $date:-</i> <br><br><div style='line-height:1.5;'>$message_body</div>";
 
     $ticket_number_esc = intval($ticket_number);
     $message_esc = mysqli_real_escape_string($mysqli, $message);