diff --git a/lib/services/email-service.ts b/lib/services/email-service.ts
index 24a20602..7c69ec35 100644
--- a/lib/services/email-service.ts
+++ b/lib/services/email-service.ts
@@ -321,16 +321,16 @@ export async function getEmails(
     for await (const message of messages) {
       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
+          address: addr.address || ''
         })),
-        to: message.envelope.to.map(addr => ({
+        to: (message.envelope?.to || []).map(addr => ({
           name: addr.name || '',
-          address: addr.address
+          address: addr.address || ''
         })),
-        subject: message.envelope.subject || '',
-        date: message.internalDate,
+        subject: message.envelope?.subject || '',
+        date: message.internalDate || new Date(),
         flags: {
           seen: message.flags.has('\\Seen'),
           answered: message.flags.has('\\Answered'),
@@ -338,7 +338,7 @@ export async function getEmails(
           draft: message.flags.has('\\Draft'),
           deleted: message.flags.has('\\Deleted')
         },
-        size: message.size,
+        size: message.size || 0,
         hasAttachments: message.bodyStructure?.childNodes?.some(node => node.disposition === 'attachment') || false
       };
       emails.push(email);