diff --git a/app/mail/page.tsx b/app/mail/page.tsx
index 9b35b10..535ac68 100644
--- a/app/mail/page.tsx
+++ b/app/mail/page.tsx
@@ -491,7 +491,9 @@ export default function MailPage() {
   // Filter emails based on current view
   const filteredEmails = emails.filter(email => {
     if (selectedAccount === 0) return true;
-    return email.accountId === selectedAccount.toString();
+    // Use the email address to match instead of accountId
+    const selectedAccountEmail = accounts.find(acc => acc.id === selectedAccount)?.email;
+    return email.from === selectedAccountEmail || email.to === selectedAccountEmail;
   }).filter(email => {
     switch (currentView) {
       case "inbox":