diff --git a/app/courrier/page.tsx b/app/courrier/page.tsx
index df6d70a2..c477ebb5 100644
--- a/app/courrier/page.tsx
+++ b/app/courrier/page.tsx
@@ -452,16 +452,16 @@ const renderEmailContent = (email: Email) => {
   console.log('First 200 chars of body:', email.body.substring(0, 200));
 
   try {
-    const parsed = parseFullEmail(email.body) as ParsedEmailContent;
+    const parsed = parseFullEmail(email.body);
     console.log('Parsed content:', {
-      hasText: !!parsed.text,
-      hasHtml: !!parsed.html,
-      textPreview: parsed.text?.substring(0, 100) || 'No text',
-      htmlPreview: parsed.html?.substring(0, 100) || 'No HTML'
+      hasText: 'text' in parsed ? !!parsed.text : false,
+      hasHtml: 'html' in parsed ? !!parsed.html : false,
+      textPreview: 'text' in parsed ? parsed.text?.substring(0, 100) : 'No text',
+      htmlPreview: 'html' in parsed ? parsed.html?.substring(0, 100) : 'No HTML'
     });
 
-    const isHtml = !!parsed.html || email.body.includes('<');
-    const content = parsed.text || parsed.html || email.body;
+    const isHtml = 'html' in parsed ? !!parsed.html : email.body.includes('<');
+    const content = 'text' in parsed ? parsed.text : ('html' in parsed ? parsed.html || '' : email.body);
     
     console.log('Selected content type:', isHtml ? 'HTML' : 'Plain text');
     console.log('Content preview:', content.substring(0, 100) + '...');
@@ -497,7 +497,7 @@ const renderEmailContent = (email: Email) => {
 
       return (
         <div className="prose prose-sm max-w-none">
-          {parsed.attachments && parsed.attachments.length > 0 && (
+          {'attachments' in parsed && parsed.attachments && parsed.attachments.length > 0 && (
             <div className="mb-4 p-2 bg-gray-50 rounded">
               <h4 className="text-sm font-medium mb-2">Attachments:</h4>
               <div className="space-y-1">
@@ -542,7 +542,7 @@ const renderEmailContent = (email: Email) => {
 
       return (
         <div className="prose prose-sm max-w-none whitespace-pre-wrap">
-          {parsed.attachments && parsed.attachments.length > 0 && (
+          {'attachments' in parsed && parsed.attachments && parsed.attachments.length > 0 && (
             <div className="mb-4 p-2 bg-gray-50 rounded">
               <h4 className="text-sm font-medium mb-2">Attachments:</h4>
               <div className="space-y-1">