diff --git a/lib/utils/email-utils.ts b/lib/utils/email-utils.ts
index 7ddab13e..51e8953e 100644
--- a/lib/utils/email-utils.ts
+++ b/lib/utils/email-utils.ts
@@ -326,12 +326,19 @@ export function formatReplyEmail(originalEmail: EmailMessage | LegacyEmailMessag
   if (htmlContent) {
     // Format HTML reply
     console.log('Formatting HTML reply, quoted content length:', htmlContent.length);
+    const sanitizedReplyContent = sanitizeHtml(htmlContent);
+    console.log('Sanitized reply content length:', sanitizedReplyContent.length);
+    console.log('Sanitized reply content truncated sample:', 
+        sanitizedReplyContent.length > 100 
+        ? sanitizedReplyContent.substring(0, 100) + '...' 
+        : sanitizedReplyContent || 'EMPTY');
+    
     htmlContent = `
       <div style="margin: 20px 0 10px 0; color: #666; border-bottom: 1px solid #ddd; padding-bottom: 5px;">
         On ${date}, ${sender} wrote:
       </div>
       <blockquote style="margin: 0; padding-left: 10px; border-left: 3px solid #ddd; color: #505050; background-color: #f9f9f9; padding: 10px;">
-        ${sanitizeHtml(htmlContent)}
+        ${sanitizedReplyContent}
       </blockquote>
     `;
   }
@@ -458,8 +465,12 @@ export function formatForwardedEmail(originalEmail: EmailMessage | LegacyEmailMe
     console.log('Formatting HTML forward, original content length:', htmlContent.length);
     
     // Important: First sanitize the content portion only
-    const sanitizedOriginalContent = sanitizeHtml(htmlContent);
-    console.log('Sanitized original content length:', sanitizedOriginalContent.length);
+    const sanitizedReplyContent = sanitizeHtml(htmlContent);
+    console.log('Sanitized forward content length:', sanitizedReplyContent.length);
+    console.log('Sanitized forward content truncated sample:', 
+        sanitizedReplyContent.length > 100 
+        ? sanitizedReplyContent.substring(0, 100) + '...' 
+        : sanitizedReplyContent || 'EMPTY');
     
     // Create the complete forwarded email with header info
     const fullForwardedEmail = `
@@ -492,9 +503,9 @@ export function formatForwardedEmail(originalEmail: EmailMessage | LegacyEmailMe
           </tbody>
         </table>
       </div>
-      <div style="margin: 0; padding-left: 10px; border-left: 3px solid #ddd; color: #505050; background-color: #f9f9f9; padding: 10px;">
-        ${sanitizedOriginalContent}
-      </div>
+      <blockquote style="margin: 0; padding-left: 10px; border-left: 3px solid #ddd; color: #505050; background-color: #f9f9f9; padding: 10px;">
+        ${sanitizedReplyContent}
+      </blockquote>
     `;
     
     // Now we have the full forwarded email structure without sanitizing it again