diff --git a/app/courrier/page.tsx b/app/courrier/page.tsx
index a9bd1839..1d6aa97a 100644
--- a/app/courrier/page.tsx
+++ b/app/courrier/page.tsx
@@ -1049,7 +1049,8 @@ export default function CourrierPage() {
           className="flex-1 overflow-y-auto"
           onScroll={handleScroll}
         >
-          {loading || isLoadingInitial ? (
+          {/* Only show loading if we don't have emails yet - this prevents stuck loading states */}
+          {(loading || isLoadingInitial) && filteredEmails.length === 0 ? (
             <div className="flex items-center justify-center h-64">
               <div className="flex flex-col items-center">
                 <div className="animate-spin rounded-full h-8 w-8 border-t-2 border-b-2 border-blue-500 mb-4"></div>
@@ -1092,6 +1093,13 @@ export default function CourrierPage() {
                   <div className="animate-spin rounded-full h-4 w-4 border-t-2 border-b-2 border-blue-500"></div>
                 </div>
               )}
+              {/* Show loading indicator at the bottom if we're still loading but have emails */}
+              {(loading || isLoadingInitial) && filteredEmails.length > 0 && (
+                <div className="sticky bottom-0 bg-white bg-opacity-90 py-2 px-4 text-xs text-center text-gray-500 flex items-center justify-center">
+                  <div className="animate-spin rounded-full h-3 w-3 border-t-2 border-b-2 border-blue-500 mr-2"></div>
+                  Refreshing email list...
+                </div>
+              )}
             </div>
           )}
         </div>
@@ -1102,8 +1110,8 @@ export default function CourrierPage() {
   // Update the email count in the header to show filtered count
   const renderEmailListHeader = () => (
     <div className="border-b border-gray-100">
-      <div className="px-4 py-3">
-        <div className="relative">
+      <div className="px-4 py-3 flex items-center justify-between">
+        <div className="relative flex-1">
           <Search className="absolute left-2 top-2 h-4 w-4 text-gray-400" />
           <Input
             type="search"