diff --git a/src/mail/app.py b/src/mail/app.py
index 6d4d10f..141a34f 100644
--- a/src/mail/app.py
+++ b/src/mail/app.py
@@ -270,7 +270,10 @@ class EmailViewerApp(App):
         metadata = self.message_store.get_metadata(message_id)
         envelope = None
         if metadata:
-            envelope = self.message_store.envelopes.get(metadata["index"])
+            index = metadata.get("index", 0)
+            # Check bounds before accessing envelopes list
+            if 0 <= index < len(self.message_store.envelopes):
+                envelope = self.message_store.envelopes[index]
 
         content_container.display_content(
             message_id, folder=folder, account=account, envelope=envelope
diff --git a/src/mail/widgets/ContentContainer.py b/src/mail/widgets/ContentContainer.py
index 30b47bc..a5d38a5 100644
--- a/src/mail/widgets/ContentContainer.py
+++ b/src/mail/widgets/ContentContainer.py
@@ -15,7 +15,7 @@ from src.mail.notification_compressor import create_compressor
 from src.mail.notification_detector import NotificationType
 import logging
 from datetime import datetime
-from typing import Literal, List, Dict, Optional
+from typing import Literal, List, Dict, Any, Optional
 from urllib.parse import urlparse
 import re
 import os