diff --git a/services/gmail.js b/services/gmail.js
index 805a5f2..41b55ff 100644
--- a/services/gmail.js
+++ b/services/gmail.js
@@ -30,7 +30,7 @@ async function sendGmailReply(
   const safeUser = escapeHtml(discordUser);
   const safeReply = escapeHtml(replyText).replace(/\n/g, '<br>');
   const safeLogoUrl = escapeHtml(CONFIG.LOGO_URL || '');
-  const safeSignature = escapeHtml(CONFIG.SIGNATURE || '');
+  const safeSignature = escapeHtml(CONFIG.SIGNATURE || '').replace(/\n/g, '<br>');
   const htmlBody = `
     <div style="font-family: sans-serif; font-size: 14px; color: #333;">
       <p><strong>From:</strong> ${safeUser} on Discord</p>
@@ -106,14 +106,11 @@ async function sendTicketClosedEmail(ticket, discordDisplayName) {
 
     const serverDisplayName = escapeHtml(discordDisplayName || 'Support');
     const safeLogoUrl = escapeHtml(CONFIG.LOGO_URL || '');
-    const safeSignature = escapeHtml(CONFIG.SIGNATURE || '');
-    const safeCloseMessage = escapeHtml(CONFIG.TICKET_CLOSE_MESSAGE || '').replace(/\n/g, '<br>');
-    const safeCloseSignature = escapeHtml(CONFIG.TICKET_CLOSE_SIGNATURE || '');
-
+    const safeSignature = escapeHtml(CONFIG.SIGNATURE || '').replace(/\n/g, '<br>');
     const htmlBody = `
       <div style="font-family: sans-serif; font-size: 14px; color: #333;">
         <p><strong>From:</strong> ${serverDisplayName} on Discord</p>
-        <p><strong>Message:</strong></p>
+        <p><strong>Message:</</strong></p>
         <p>${safeCloseMessage}</p>
         <p style="margin-top: 16px;">${safeCloseSignature}</p>
         <hr style="border:none; border-top:1px solid #ddd; margin:20px 0;">
@@ -203,25 +200,26 @@ async function sendTicketNotificationEmail(ticket, subjectLine, messageBody, fro
       signatureBlocks = await getStaffSignatureBlocks(userId);
     }
     
-    const safeSignature = escapeHtml(CONFIG.SIGNATURE || '');
-    const htmlBody = `
-      <div style="font-family: sans-serif; font-size: 14px; color: #333;">
-        <p><strong>From:</strong> ${label} on Discord</p>
-        <p>${safeBody}</p>
-        <hr style="border:none; border-top:1px solid #ddd; margin:20px 0;">
-        <table border="0" cellpadding="0" cellspacing="0">
-          <tr>
-            <td style="padding-right: 12px;">
-              ${safeLogoUrl ? `<img src="${safeLogoUrl}" width="65">` : ''}
-            </td>
-            <td style="border-left: 1px solid #ddd; padding-left: 12px;">
-              ${signatureBlocks.html || `<p style="margin: 0; font-weight: bold;">${label}</p>`}
-              ${signatureBlocks.html ? '<hr style="border:none; border-top:1px solid #ddd; margin:10px 0;">' : ''}
-              ${signatureBlocks.html ? signatureBlocks.html : `<div style="color: #666; font-size: 12px;">${safeSignature}</div>`}
-            </td>
-          </tr>
-        </table>
-      </div>`;
+  const safeSignature = escapeHtml(CONFIG.SIGNATURE || '').replace(/\n/g, '<br>');
+  const htmlBody = `
+    <div style="font-family: sans-serif; font-size: 14px; color: #333;">
+      <p><strong>From:</strong> ${serverDisplayName} on Discord</p>
+      <p><strong>Message:</strong></p>
+      <p>${safeCloseMessage}</p>
+      <p style="margin-top: 16px;">${safeCloseSignature}</p>
+      <hr style="border:none; border-top:1px solid #ddd; margin:20px 0;">
+      <table border="0" cellpadding="0" cellspacing="0">
+        <tr>
+          <td style="padding-right: 12px;">
+            ${safeLogoUrl ? `<img src="${safeLogoUrl}" width="65">` : ''}
+          </td>
+          <td style="border-left: 1px solid #ddd; padding-left: 12px;">
+            <p style="margin: 0; font-weight: bold;">${serverDisplayName}</p>
+            <div style="color: #666; font-size: 12px;">${safeSignature}</div>
+          </td>
+        </tr>
+      </table>
+    </div>`;
 
     const rawHeaders = [
       `From: ${CONFIG.MY_EMAIL}`,