diff --git a/app/mail/page.tsx b/app/mail/page.tsx
index 9a14800..22791cf 100644
--- a/app/mail/page.tsx
+++ b/app/mail/page.tsx
@@ -993,22 +993,38 @@ export default function MailPage() {
               </div>
 
               <div className="prose max-w-none">
-                {decodeMimeContent(selectedEmail.body)}
+                {(() => {
+                  try {
+                    const parsed = parseFullEmail(selectedEmail.body);
+                    return parsed.html || parsed.text || selectedEmail.body;
+                  } catch (e) {
+                    console.error('Error parsing email content:', e);
+                    return selectedEmail.body;
+                  }
+                })()}
               </div>
 
-              {selectedEmail && parseFullEmail(selectedEmail.body).attachments.length > 0 && (
-                <div className="mt-6 border-t border-gray-200 pt-6">
-                  <h3 className="text-sm font-semibold text-gray-900 mb-4">Attachments</h3>
-                  <div className="grid grid-cols-2 gap-4">
-                    {parseFullEmail(selectedEmail.body).attachments.map((attachment, index) => (
-                      <div key={index} className="flex items-center p-3 border rounded-lg">
-                        <Paperclip className="h-5 w-5 text-gray-400 mr-2" />
-                        <span className="text-sm text-gray-600 truncate">{attachment.filename}</span>
+              {(() => {
+                try {
+                  const parsed = parseFullEmail(selectedEmail.body);
+                  return parsed?.attachments?.length > 0 ? (
+                    <div className="mt-6 border-t border-gray-200 pt-6">
+                      <h3 className="text-sm font-semibold text-gray-900 mb-4">Attachments</h3>
+                      <div className="grid grid-cols-2 gap-4">
+                        {parsed.attachments.map((attachment, index) => (
+                          <div key={index} className="flex items-center space-x-2 p-2 border rounded">
+                            <Paperclip className="h-4 w-4 text-gray-400" />
+                            <span className="text-sm text-gray-600 truncate">{attachment.filename}</span>
+                          </div>
+                        ))}
                       </div>
-                    ))}
-                  </div>
-                </div>
-              )}
+                    </div>
+                  ) : null;
+                } catch (e) {
+                  console.error('Error parsing email attachments:', e);
+                  return null;
+                }
+              })()}
             </div>
           ) : (
             <div className="flex flex-col items-center justify-center h-full">