diff --git a/src/routeTree.gen.ts b/src/routeTree.gen.ts
index e96b5e5..59ca129 100644
--- a/src/routeTree.gen.ts
+++ b/src/routeTree.gen.ts
@@ -44,6 +44,7 @@ import { Route as PayIdRouteImport } from './routes/pay.$id'
 import { Route as PSlugRouteImport } from './routes/p.$slug'
 import { Route as InvoicesNewRouteImport } from './routes/invoices.new'
 import { Route as InvoicesInvoiceIdRouteImport } from './routes/invoices.$invoiceId'
+import { Route as HooksRematchEmailsRouteImport } from './routes/hooks/rematch-emails'
 import { Route as HooksPollImapRouteImport } from './routes/hooks/poll-imap'
 import { Route as EmailUnsubscribeRouteImport } from './routes/email/unsubscribe'
 import { Route as ContactsContactIdRouteImport } from './routes/contacts.$contactId'
@@ -242,6 +243,11 @@ const InvoicesInvoiceIdRoute = InvoicesInvoiceIdRouteImport.update({
   path: '/invoices/$invoiceId',
   getParentRoute: () => rootRouteImport,
 } as any)
+const HooksRematchEmailsRoute = HooksRematchEmailsRouteImport.update({
+  id: '/hooks/rematch-emails',
+  path: '/hooks/rematch-emails',
+  getParentRoute: () => rootRouteImport,
+} as any)
 const HooksPollImapRoute = HooksPollImapRouteImport.update({
   id: '/hooks/poll-imap',
   path: '/hooks/poll-imap',
@@ -374,6 +380,7 @@ export interface FileRoutesByFullPath {
   '/contacts/$contactId': typeof ContactsContactIdRoute
   '/email/unsubscribe': typeof EmailUnsubscribeRoute
   '/hooks/poll-imap': typeof HooksPollImapRoute
+  '/hooks/rematch-emails': typeof HooksRematchEmailsRoute
   '/invoices/$invoiceId': typeof InvoicesInvoiceIdRoute
   '/invoices/new': typeof InvoicesNewRouteWithChildren
   '/p/$slug': typeof PSlugRoute
@@ -432,6 +439,7 @@ export interface FileRoutesByTo {
   '/contacts/$contactId': typeof ContactsContactIdRoute
   '/email/unsubscribe': typeof EmailUnsubscribeRoute
   '/hooks/poll-imap': typeof HooksPollImapRoute
+  '/hooks/rematch-emails': typeof HooksRematchEmailsRoute
   '/invoices/$invoiceId': typeof InvoicesInvoiceIdRoute
   '/invoices/new': typeof InvoicesNewRouteWithChildren
   '/p/$slug': typeof PSlugRoute
@@ -492,6 +500,7 @@ export interface FileRoutesById {
   '/contacts/$contactId': typeof ContactsContactIdRoute
   '/email/unsubscribe': typeof EmailUnsubscribeRoute
   '/hooks/poll-imap': typeof HooksPollImapRoute
+  '/hooks/rematch-emails': typeof HooksRematchEmailsRoute
   '/invoices/$invoiceId': typeof InvoicesInvoiceIdRoute
   '/invoices/new': typeof InvoicesNewRouteWithChildren
   '/p/$slug': typeof PSlugRoute
@@ -553,6 +562,7 @@ export interface FileRouteTypes {
     | '/contacts/$contactId'
     | '/email/unsubscribe'
     | '/hooks/poll-imap'
+    | '/hooks/rematch-emails'
     | '/invoices/$invoiceId'
     | '/invoices/new'
     | '/p/$slug'
@@ -611,6 +621,7 @@ export interface FileRouteTypes {
     | '/contacts/$contactId'
     | '/email/unsubscribe'
     | '/hooks/poll-imap'
+    | '/hooks/rematch-emails'
     | '/invoices/$invoiceId'
     | '/invoices/new'
     | '/p/$slug'
@@ -670,6 +681,7 @@ export interface FileRouteTypes {
     | '/contacts/$contactId'
     | '/email/unsubscribe'
     | '/hooks/poll-imap'
+    | '/hooks/rematch-emails'
     | '/invoices/$invoiceId'
     | '/invoices/new'
     | '/p/$slug'
@@ -730,6 +742,7 @@ export interface RootRouteChildren {
   ContactsContactIdRoute: typeof ContactsContactIdRoute
   EmailUnsubscribeRoute: typeof EmailUnsubscribeRoute
   HooksPollImapRoute: typeof HooksPollImapRoute
+  HooksRematchEmailsRoute: typeof HooksRematchEmailsRoute
   InvoicesInvoiceIdRoute: typeof InvoicesInvoiceIdRoute
   InvoicesNewRoute: typeof InvoicesNewRouteWithChildren
   PSlugRoute: typeof PSlugRoute
@@ -1008,6 +1021,13 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof InvoicesInvoiceIdRouteImport
       parentRoute: typeof rootRouteImport
     }
+    '/hooks/rematch-emails': {
+      id: '/hooks/rematch-emails'
+      path: '/hooks/rematch-emails'
+      fullPath: '/hooks/rematch-emails'
+      preLoaderRoute: typeof HooksRematchEmailsRouteImport
+      parentRoute: typeof rootRouteImport
+    }
     '/hooks/poll-imap': {
       id: '/hooks/poll-imap'
       path: '/hooks/poll-imap'
@@ -1239,6 +1259,7 @@ const rootRouteChildren: RootRouteChildren = {
   ContactsContactIdRoute: ContactsContactIdRoute,
   EmailUnsubscribeRoute: EmailUnsubscribeRoute,
   HooksPollImapRoute: HooksPollImapRoute,
+  HooksRematchEmailsRoute: HooksRematchEmailsRoute,
   InvoicesInvoiceIdRoute: InvoicesInvoiceIdRoute,
   InvoicesNewRoute: InvoicesNewRouteWithChildren,
   PSlugRoute: PSlugRoute,
diff --git a/src/routes/cases.$caseId.tsx b/src/routes/cases.$caseId.tsx
index 94eef20..7012bf3 100644
--- a/src/routes/cases.$caseId.tsx
+++ b/src/routes/cases.$caseId.tsx
@@ -321,6 +321,7 @@ function CaseTabs({ data, caseId, canManage, load, tab, onTabChange }: { data: a
           <TabsTrigger value="trust"><Wallet className="h-3.5 w-3.5 mr-1.5" />Trust</TabsTrigger>
         )}
         <TabsTrigger value="calls"><Phone className="h-3.5 w-3.5 mr-1.5" />Calls</TabsTrigger>
+        <TabsTrigger value="messages"><Mail className="h-3.5 w-3.5 mr-1.5" />Messages</TabsTrigger>
         <TabsTrigger value="tasks"><CheckSquare className="h-3.5 w-3.5 mr-1.5" />Tasks</TabsTrigger>
         <TabsTrigger value="custom"><Tag className="h-3.5 w-3.5 mr-1.5" />Custom fields</TabsTrigger>
         {(data.client?.client_type === "hoa" || data.client?.client_type === "condo") && (
@@ -338,6 +339,7 @@ function CaseTabs({ data, caseId, canManage, load, tab, onTabChange }: { data: a
         <TabsContent value="trust"><TrustAccountPanel clientId={data.client_id} caseId={caseId} /></TabsContent>
       )}
       <TabsContent value="calls"><CaseCallLogsTab caseId={caseId} /></TabsContent>
+      <TabsContent value="messages"><CaseMessagesTab caseId={caseId} /></TabsContent>
       <TabsContent value="tasks"><CaseTasksTab caseId={caseId} /></TabsContent>
       <TabsContent value="custom"><CaseCustomFieldsTab caseId={caseId} /></TabsContent>
       {(data.client?.client_type === "hoa" || data.client?.client_type === "condo") && (