courrier multi account restore compose

app/courrier/page.tsx

@@ -197,7 +197,8 @@ export default function CourrierPage() {
                       (emailWithFlags.flags && !emailWithFlags.flags.seen) || 
                       false;
       
-      if (isUnread && email.folder === 'INBOX') {
+      // Count unread emails regardless of current folder
+      if (isUnread) {
         // If email has an accountId, increment that account's count
         if (email.accountId) {
           const currentCount = accountUnreadCounts.get(email.accountId) || 0;

lib/services/email-service.ts

@@ -302,6 +302,8 @@ export async function getEmails(
     const start = Math.max(1, totalEmails - (page * perPage) + 1);
     const end = Math.max(1, totalEmails - ((page - 1) * perPage));
     
+    // Only fetch if we have messages
+    if (totalEmails > 0) {
       // Fetch messages
       const messages = await client.fetch(`${start}:${end}`, {
         envelope: true,
@@ -337,7 +339,8 @@ export async function getEmails(
           size: message.size || 0,
           hasAttachments: message.bodyStructure?.childNodes?.some(node => node.disposition === 'attachment') || false,
           folder: folder,
-        contentFetched: false
+          contentFetched: false,
+          accountId: accountId
         };
         emails.push(email);
       }
@@ -356,6 +359,23 @@ export async function getEmails(
       await cacheEmailList(userId, accountId || 'default', folder, page, perPage, result);
 
       return result;
+    } else {
+      // Return empty result for empty folders
+      const result: EmailListResult = {
+        emails: [],
+        totalEmails: 0,
+        page,
+        perPage,
+        totalPages: 0,
+        folder,
+        mailboxes: await getMailboxes(client)
+      };
+
+      // Cache the empty result
+      await cacheEmailList(userId, accountId || 'default', folder, page, perPage, result);
+
+      return result;
+    }
   } catch (error) {
     console.error(`Error fetching emails for ${userId}${accountId ? ` account ${accountId}` : ''}:`, error);
     throw error;

lib/types.ts

@@ -33,29 +33,26 @@ export interface EmailAttachment {
 
 export interface EmailMessage {
   id: string;
-  messageId?: string;
-  subject: string;
   from: EmailAddress[];
   to: EmailAddress[];
   cc?: EmailAddress[];
   bcc?: EmailAddress[];
+  subject: string;
+  content: string;
+  preview?: string;
   date: Date;
   flags: {
     seen: boolean;
-    flagged: boolean;
     answered: boolean;
-    deleted: boolean;
+    flagged: boolean;
     draft: boolean;
+    deleted: boolean;
   };
-  preview?: string;
+  size: number;
-  content?: string;
-  html?: string;
-  text?: string;
   hasAttachments: boolean;
-  attachments?: EmailAttachment[];
   folder: string;
-  size?: number;
   contentFetched: boolean;
+  accountId?: string;
 }
 
 export interface Account {