diff --git a/app/mail/page.tsx b/app/mail/page.tsx
index ac8a0f5..2ffa285 100644
--- a/app/mail/page.tsx
+++ b/app/mail/page.tsx
@@ -439,10 +439,10 @@ export default function MailPage() {
   const [showBcc, setShowBcc] = useState(false);
   const [emails, setEmails] = useState<Email[]>([]);
   const [error, setError] = useState<string | null>(null);
+  const [composeSubject, setComposeSubject] = useState('');
   const [composeTo, setComposeTo] = useState('');
   const [composeCc, setComposeCc] = useState('');
   const [composeBcc, setComposeBcc] = useState('');
-  const [composeSubject, setComposeSubject] = useState('');
   const [composeBody, setComposeBody] = useState('');
   const [selectedEmail, setSelectedEmail] = useState<Email | null>(null);
   const [sidebarOpen, setSidebarOpen] = useState(true);
@@ -462,10 +462,7 @@ export default function MailPage() {
   const [attachments, setAttachments] = useState<Attachment[]>([]);
   const [folders, setFolders] = useState<string[]>([]);
 
-  // Remove the mock folders array and use the state instead
-  const [folders, setFolders] = useState<string[]>([]);
-
-  // Remove the temporary filteredEmails and keep only the useMemo version
+  // Filter emails based on current view and selected account
   const filteredEmails = useMemo(() => {
     return emails.filter(email => {
       // First filter by account if one is selected