diff --git a/app/courrier/page.tsx b/app/courrier/page.tsx
index 8f105caa..43423fc6 100644
--- a/app/courrier/page.tsx
+++ b/app/courrier/page.tsx
@@ -417,19 +417,19 @@ export default function CourrierPage() {
     const folderLower = folder.toLowerCase();
     
     if (folderLower.includes('inbox')) {
-      return Inbox;
+      return <Inbox className="h-4 w-4 text-gray-500" />;
     } else if (folderLower.includes('sent')) {
-      return Send;
+      return <Send className="h-4 w-4 text-gray-500" />;
     } else if (folderLower.includes('trash')) {
-      return Trash;
+      return <Trash className="h-4 w-4 text-gray-500" />;
     } else if (folderLower.includes('archive')) {
-      return Archive;
+      return <Archive className="h-4 w-4 text-gray-500" />;
     } else if (folderLower.includes('draft')) {
-      return Edit;
+      return <Edit className="h-4 w-4 text-gray-500" />;
     } else if (folderLower.includes('spam') || folderLower.includes('junk')) {
-      return AlertOctagon;
+      return <AlertOctagon className="h-4 w-4 text-gray-500" />;
     } else {
-      return Folder;
+      return <Folder className="h-4 w-4 text-gray-500" />;
     }
   };
   
@@ -1068,10 +1068,13 @@ export default function CourrierPage() {
                           onSelectEmail={handleEmailSelect}
                           onToggleSelect={toggleEmailSelection}
                           onToggleSelectAll={toggleSelectAll}
-                          onToggleStar={toggleStarred}
+                          onToggleStarred={toggleStarred}
                           onLoadMore={handleLoadMore}
                           hasMoreEmails={page < totalPages}
                           currentFolder={currentFolder}
+                          isLoading={isLoading}
+                          totalEmails={emails.length}
+                          onBulkAction={handleBulkAction}
                         />
                       )}
                     </div>
@@ -1086,24 +1089,24 @@ export default function CourrierPage() {
       {/* Modals and Dialogs */}
       <DeleteConfirmDialog 
         show={showDeleteConfirm}
-        open={showDeleteConfirm} 
-        onOpenChange={setShowDeleteConfirm}
+        selectedCount={selectedEmailIds.length}
         onConfirm={handleDeleteConfirm}
+        onCancel={() => setShowDeleteConfirm(false)}
       />
       
       <LoginNeededAlert 
-        open={showLoginNeeded} 
-        onOpenChange={setShowLoginNeeded}
-        onGoToLogin={handleGoToLogin}
+        show={showLoginNeeded}
+        onLogin={handleGoToLogin}
+        onClose={() => setShowLoginNeeded(false)}
       />
       
       <Dialog open={showComposeModal} onOpenChange={setShowComposeModal}>
         <DialogContent className="sm:max-w-[800px] h-[80vh] p-0 overflow-hidden">
           <ComposeEmail 
             type={composeType}
-            replyToEmail={composeType !== 'new' ? selectedEmail : undefined}
+            initialEmail={composeType !== 'new' ? selectedEmail : undefined}
             onSend={handleSendEmail}
-            onCancel={() => setShowComposeModal(false)}
+            onClose={() => setShowComposeModal(false)}
             isSending={isSending}
           />
         </DialogContent>