diff --git a/components/email/EmailPanel.tsx b/components/email/EmailPanel.tsx
index 49db736a..dcfa4458 100644
--- a/components/email/EmailPanel.tsx
+++ b/components/email/EmailPanel.tsx
@@ -79,13 +79,16 @@ export default function EmailPanel({
     
     console.log('EmailPanel: Raw email:', email);
     
-    // Format the email content
+    // Format the email content while preserving the original structure
     const formattedContent = formatEmailContent(email);
     console.log('EmailPanel: Formatted content:', formattedContent);
     
     return {
       ...email,
-      content: formattedContent
+      content: {
+        html: formattedContent,
+        text: email.content?.text || email.text || ''
+      }
     };
   }, [email]);
 
diff --git a/components/email/EmailPreview.tsx b/components/email/EmailPreview.tsx
index b10d7dd2..b86ac59d 100644
--- a/components/email/EmailPreview.tsx
+++ b/components/email/EmailPreview.tsx
@@ -139,8 +139,8 @@ export default function EmailPreview({ email, loading = false, onReply }: EmailP
       
       // Sanitize the content for display
       const sanitizedContent = DOMPurify.sanitize(content, {
-        ADD_TAGS: ['style'],
-        ADD_ATTR: ['class', 'style', 'dir'],
+        ADD_TAGS: ['style', 'table', 'thead', 'tbody', 'tr', 'td', 'th'],
+        ADD_ATTR: ['class', 'style', 'dir', 'colspan', 'rowspan'],
         ALLOW_DATA_ATTR: false
       });