diff --git a/components/email/EmailPanel.tsx b/components/email/EmailPanel.tsx
index 3dee9037..ad13cdf7 100644
--- a/components/email/EmailPanel.tsx
+++ b/components/email/EmailPanel.tsx
@@ -77,11 +77,14 @@ export default function EmailPanel({
       // Handle different content structures
       let content = '';
       
-      if (typeof email.content === 'string') {
+      if (email.formattedContent) {
+        // If we already have formatted content, use that
+        content = email.formattedContent;
+      } else if (typeof email.content === 'string') {
         // Direct string content
         content = email.content;
       } else if (email.content && typeof email.content === 'object') {
-        // Object with text/html properties
+        // Object with text/html properties (new structure)
         content = email.content.html || email.content.text || '';
       } else {
         // Fallback to html or text properties
diff --git a/components/email/EmailPreview.tsx b/components/email/EmailPreview.tsx
index e372f4e6..617f7827 100644
--- a/components/email/EmailPreview.tsx
+++ b/components/email/EmailPreview.tsx
@@ -114,12 +114,16 @@ export default function EmailPreview({ email, loading = false, onReply }: EmailP
       let content = '';
       
       if (email.formattedContent) {
+        // If we already have formatted content, use that
         content = email.formattedContent;
       } else if (typeof email.content === 'string') {
+        // Direct string content
         content = email.content;
       } else if (email.content && typeof email.content === 'object') {
+        // Object with text/html properties (new structure)
         content = email.content.html || email.content.text || '';
       } else {
+        // Fallback to html or text properties
         content = email.html || email.text || '';
       }