diff --git a/lib/services/email-service.ts b/lib/services/email-service.ts
index 006f0fa..9bcaadc 100644
--- a/lib/services/email-service.ts
+++ b/lib/services/email-service.ts
@@ -1165,16 +1165,16 @@ export async function getEmails(
         
         const email: EmailMessage = {
           id: message.uid.toString(),
-          from: message.envelope.from?.map(addr => ({
+          from: message.envelope?.from?.map(addr => ({
             name: addr.name || '',
             address: addr.address || ''
           })) || [],
-          to: message.envelope.to?.map(addr => ({
+          to: message.envelope?.to?.map(addr => ({
             name: addr.name || '',
             address: addr.address || ''
           })) || [],
-          subject: message.envelope.subject || '',
-          date: message.envelope.date || new Date(),
+          subject: message.envelope?.subject || '',
+          date: message.envelope?.date || new Date(),
           flags: {
             seen: message.flags.has('\\Seen'),
             flagged: message.flags.has('\\Flagged'),