diff --git a/components/email/EmailPanel.tsx b/components/email/EmailPanel.tsx
index 6529615c..2f2a9fbf 100644
--- a/components/email/EmailPanel.tsx
+++ b/components/email/EmailPanel.tsx
@@ -82,7 +82,13 @@ export default function EmailPanel({
     // If content is already an object with html/text, use it directly
     if (email.content && typeof email.content === 'object') {
       console.log('EmailPanel: Using existing content object');
-      return email;
+      return {
+        ...email,
+        content: {
+          text: email.content.text || '',
+          html: email.content.html || ''
+        }
+      };
     }
     
     // If content is a string, convert it to object format
diff --git a/components/email/EmailPreview.tsx b/components/email/EmailPreview.tsx
index e9b60d77..6e5b729b 100644
--- a/components/email/EmailPreview.tsx
+++ b/components/email/EmailPreview.tsx
@@ -134,6 +134,12 @@ export default function EmailPreview({ email, loading = false, onReply }: EmailP
         content = email.html || email.text || '';
       }
       
+      // If content is empty, try to get it from the formattedContent property
+      if (!content && email.formattedContent) {
+        console.log('EmailPreview: Using formattedContent property');
+        content = email.formattedContent;
+      }
+      
       console.log('EmailPreview: Content before sanitization:', content);
       
       // Sanitize the content for display