diff --git a/components/ComposeEmail.tsx b/components/ComposeEmail.tsx
index 8f0ec69d..3d6ab488 100644
--- a/components/ComposeEmail.tsx
+++ b/components/ComposeEmail.tsx
@@ -90,11 +90,10 @@ export default function ComposeEmail({
         // Get the original email content
         const originalContent = replyTo?.body || forwardFrom?.body || '';
         
-        // Create MIME headers with proper content type detection
-        const contentType = mime.getType('html') || 'text/html';
+        // Create MIME headers
         const mimeHeaders = {
           'MIME-Version': '1.0',
-          'Content-Type': `multipart/alternative; boundary="----=_NextPart_000_0000_01D9A123.ABCDEF00"`,
+          'Content-Type': 'multipart/alternative',
           'From': forwardFrom?.from || replyTo?.from || '',
           'Date': new Date(forwardFrom?.date || replyTo?.date || '').toUTCString(),
           'Subject': forwardFrom?.subject || replyTo?.subject || '',
@@ -102,36 +101,27 @@ export default function ComposeEmail({
           'Cc': forwardFrom?.cc || replyTo?.cc || '',
         };
 
-        // Create the reply/forward structure with proper MIME formatting
+        // Create the reply/forward structure
         content = `
           <div class="compose-area" contenteditable="true" style="min-height: 100px; padding: 10px; border: 1px solid #e5e7eb; border-radius: 4px; margin-bottom: 20px;"></div>
           <div class="quoted-content" contenteditable="false" style="color: #6b7280; font-size: 0.875rem;">
             ${forwardFrom ? `
               <div style="margin-bottom: 10px;">
                 ---------- Forwarded message ---------<br/>
-                ${Object.entries(mimeHeaders)
-                  .filter(([key, value]) => value)
-                  .map(([key, value]) => `${key}: ${value}<br/>`)
-                  .join('')}
-                <br/>
-                This is a multi-part message in MIME format.<br/>
-                <br/>
-                ------=_NextPart_000_0000_01D9A123.ABCDEF00<br/>
-                Content-Type: ${contentType}; charset="utf-8"<br/>
-                Content-Transfer-Encoding: quoted-printable<br/>
-                <br/>
-                ${originalContent.replace(/\n/g, '<br/>')}<br/>
-                <br/>
-                ------=_NextPart_000_0000_01D9A123.ABCDEF00--<br/>
+                From: ${forwardFrom.from}<br/>
+                Date: ${new Date(forwardFrom.date).toLocaleString()}<br/>
+                Subject: ${forwardFrom.subject}<br/>
+                To: ${forwardFrom.to}<br/>
+                ${forwardFrom.cc ? `Cc: ${forwardFrom.cc}<br/>` : ''}
               </div>
             ` : `
               <div style="margin-bottom: 10px;">
                 On ${new Date(replyTo?.date || '').toLocaleString()}, ${replyTo?.from} wrote:
               </div>
-              <blockquote style="margin: 0; padding-left: 1em; border-left: 2px solid #e5e7eb;">
-                ${originalContent}
-              </blockquote>
             `}
+            <blockquote style="margin: 0; padding-left: 1em; border-left: 2px solid #e5e7eb;">
+              ${originalContent}
+            </blockquote>
           </div>
         `;
       } else {
@@ -161,13 +151,10 @@ export default function ComposeEmail({
     if (!composeBodyRef.current) return;
     const content = composeBodyRef.current.innerHTML;
     
-    // Get the content type based on the content
-    const contentType = mime.getType('html') || 'text/html';
-    
     // Create MIME headers
     const mimeHeaders = {
       'MIME-Version': '1.0',
-      'Content-Type': `${contentType}; charset="utf-8"`,
+      'Content-Type': 'text/html; charset="utf-8"',
       'Content-Transfer-Encoding': 'quoted-printable'
     };