diff --git a/apps/web/src/app/[orgShortCode]/convo/[convoId]/page.tsx b/apps/web/src/app/[orgShortCode]/convo/[convoId]/page.tsx
index 557f895b..bd57b451 100644
--- a/apps/web/src/app/[orgShortCode]/convo/[convoId]/page.tsx
+++ b/apps/web/src/app/[orgShortCode]/convo/[convoId]/page.tsx
@@ -11,6 +11,7 @@ import { MessagesPanel } from './_components/messages-panel';
 import TopBar from './_components/top-bar';
 import { ReplyBox } from './_components/reply-box';
 import { Button } from '@/src/components/shadcn-ui/button';
+import Metadata from '@/src/components/metadata';
 
 const STORAGE_URL = env('NEXT_PUBLIC_STORAGE_URL');
 
@@ -79,6 +80,15 @@ function ConvoView({ convoId }: { convoId: TypeId<'convos'> }) {
 
   return (
     <div className="flex h-full max-h-full w-full max-w-full flex-col overflow-hidden rounded-2xl">
+      <Metadata
+        title={
+          'Convo' +
+          (convoData?.data.subjects.length
+            ? ` - ${convoData?.data.subjects.map((s) => s.subject).join(', ')}`
+            : ' - UnInbox')
+        }
+        description=""
+      />
       <TopBar
         isConvoLoading={convoDataLoading}
         convoId={convoId}
diff --git a/apps/web/src/app/[orgShortCode]/settings/org/mail/addresses/[addressId]/page.tsx b/apps/web/src/app/[orgShortCode]/settings/org/mail/addresses/[addressId]/page.tsx
index d8425cc5..6b65982e 100644
--- a/apps/web/src/app/[orgShortCode]/settings/org/mail/addresses/[addressId]/page.tsx
+++ b/apps/web/src/app/[orgShortCode]/settings/org/mail/addresses/[addressId]/page.tsx
@@ -1,5 +1,6 @@
 'use client';
 
+import Metadata from '@/src/components/metadata';
 import { api } from '@/src/lib/trpc';
 import { useGlobalStore } from '@/src/providers/global-store-provider';
 import { type TypeId } from '@u22n/utils/typeid';
@@ -29,6 +30,10 @@ export default function Page({
 
   return (
     <div className="flex h-full w-full flex-col gap-2 p-4">
+      <Metadata
+        title="Org Settings - Addresses"
+        description="Manage your organization"
+      />
       <div className="flex w-full gap-4 py-2">
         <Button
           asChild
diff --git a/apps/web/src/app/[orgShortCode]/settings/org/mail/addresses/page.tsx b/apps/web/src/app/[orgShortCode]/settings/org/mail/addresses/page.tsx
index 7255451e..5d2c4016 100644
--- a/apps/web/src/app/[orgShortCode]/settings/org/mail/addresses/page.tsx
+++ b/apps/web/src/app/[orgShortCode]/settings/org/mail/addresses/page.tsx
@@ -1,5 +1,6 @@
 'use client';
 
+import Metadata from '@/src/components/metadata';
 import { DataTable } from '@/src/components/shared/table';
 import { api } from '@/src/lib/trpc';
 import { useGlobalStore } from '@/src/providers/global-store-provider';
@@ -15,6 +16,10 @@ export default function Page() {
 
   return (
     <div className="flex w-full flex-col gap-2 p-4">
+      <Metadata
+        title="Org Settings - Addresses"
+        description="Manage your organization"
+      />
       <div className="flex w-full justify-between">
         <div className="flex flex-col gap-2">
           <h1 className="font-display text-3xl leading-5">Addresses</h1>
diff --git a/apps/web/src/app/[orgShortCode]/settings/org/mail/domains/[domainId]/page.tsx b/apps/web/src/app/[orgShortCode]/settings/org/mail/domains/[domainId]/page.tsx
index 2420f930..27b204f0 100644
--- a/apps/web/src/app/[orgShortCode]/settings/org/mail/domains/[domainId]/page.tsx
+++ b/apps/web/src/app/[orgShortCode]/settings/org/mail/domains/[domainId]/page.tsx
@@ -1,5 +1,6 @@
 'use client';
 
+import Metadata from '@/src/components/metadata';
 import { Button } from '@/src/components/shadcn-ui/button';
 import { api } from '@/src/lib/trpc';
 import { useGlobalStore } from '@/src/providers/global-store-provider';
@@ -46,6 +47,10 @@ export default function Page({
 
   return (
     <div className="flex h-full w-full flex-col gap-2 p-4">
+      <Metadata
+        title="Org Settings - Domains"
+        description="Manage your organization"
+      />
       <div className="flex w-full gap-4 py-2">
         <Button
           asChild
diff --git a/apps/web/src/app/[orgShortCode]/settings/org/mail/domains/page.tsx b/apps/web/src/app/[orgShortCode]/settings/org/mail/domains/page.tsx
index ff6b6b07..197f2f52 100644
--- a/apps/web/src/app/[orgShortCode]/settings/org/mail/domains/page.tsx
+++ b/apps/web/src/app/[orgShortCode]/settings/org/mail/domains/page.tsx
@@ -1,5 +1,6 @@
 'use client';
 
+import Metadata from '@/src/components/metadata';
 import { DataTable } from '@/src/components/shared/table';
 import { api } from '@/src/lib/trpc';
 import { useGlobalStore } from '@/src/providers/global-store-provider';
@@ -15,6 +16,10 @@ export default function Page() {
 
   return (
     <div className="flex w-full flex-col gap-2 p-4">
+      <Metadata
+        title="Org Settings - Domains"
+        description="Manage your organization"
+      />
       <div className="flex w-full justify-between">
         <div className="flex flex-col gap-2">
           <h1 className="font-display text-3xl leading-5">Domains</h1>
diff --git a/apps/web/src/app/[orgShortCode]/settings/org/page.tsx b/apps/web/src/app/[orgShortCode]/settings/org/page.tsx
index a10cf6dc..6018f0f9 100644
--- a/apps/web/src/app/[orgShortCode]/settings/org/page.tsx
+++ b/apps/web/src/app/[orgShortCode]/settings/org/page.tsx
@@ -1,5 +1,6 @@
 'use client';
 
+import Metadata from '@/src/components/metadata';
 import { useRouter } from 'next/navigation';
 import { useState, useMemo } from 'react';
 import { Button } from '@/src/components/shadcn-ui/button';
@@ -67,6 +68,10 @@ export default function ProfileComponent() {
 
   return (
     <div className="flex h-full w-full flex-col items-start gap-4 overflow-y-auto p-4">
+      <Metadata
+        title="Org Settings - Profile"
+        description="Manage your organization"
+      />
       <PageTitle title="Your Profile" />
 
       <div className="flex flex-col gap-3">
diff --git a/apps/web/src/app/[orgShortCode]/settings/org/setup/billing/page.tsx b/apps/web/src/app/[orgShortCode]/settings/org/setup/billing/page.tsx
index 5b0007f6..1cb786a8 100644
--- a/apps/web/src/app/[orgShortCode]/settings/org/setup/billing/page.tsx
+++ b/apps/web/src/app/[orgShortCode]/settings/org/setup/billing/page.tsx
@@ -1,5 +1,6 @@
 'use client';
 
+import Metadata from '@/src/components/metadata';
 import { Button } from '@/src/components/shadcn-ui/button';
 import { api } from '@/src/lib/trpc';
 import { useGlobalStore } from '@/src/providers/global-store-provider';
@@ -30,6 +31,10 @@ export default function Page() {
 
   return (
     <div className="flex w-full flex-col gap-2 p-4">
+      <Metadata
+        title="Org Settings - Billing"
+        description="Manage your organization"
+      />
       <PageTitle
         title="Billing"
         description="Manage your organization's billing"
diff --git a/apps/web/src/app/[orgShortCode]/settings/org/users/invites/page.tsx b/apps/web/src/app/[orgShortCode]/settings/org/users/invites/page.tsx
index 793ce8a7..7a1183b9 100644
--- a/apps/web/src/app/[orgShortCode]/settings/org/users/invites/page.tsx
+++ b/apps/web/src/app/[orgShortCode]/settings/org/users/invites/page.tsx
@@ -1,5 +1,6 @@
 'use client';
 
+import Metadata from '@/src/components/metadata';
 import { DataTable } from '@/src/components/shared/table';
 import { api } from '@/src/lib/trpc';
 import { useGlobalStore } from '@/src/providers/global-store-provider';
@@ -15,6 +16,10 @@ export default function Page() {
 
   return (
     <div className="flex w-full flex-col gap-2 p-4">
+      <Metadata
+        title="Org Settings - Invites"
+        description="Manage your organization"
+      />
       <div className="flex w-full justify-between">
         <div className="flex flex-col gap-2">
           <h1 className="font-display text-3xl leading-5">Invites</h1>
diff --git a/apps/web/src/app/[orgShortCode]/settings/org/users/members/page.tsx b/apps/web/src/app/[orgShortCode]/settings/org/users/members/page.tsx
index cd60e88d..c909760b 100644
--- a/apps/web/src/app/[orgShortCode]/settings/org/users/members/page.tsx
+++ b/apps/web/src/app/[orgShortCode]/settings/org/users/members/page.tsx
@@ -1,5 +1,6 @@
 'use client';
 
+import Metadata from '@/src/components/metadata';
 import { DataTable } from '@/src/components/shared/table';
 import { api } from '@/src/lib/trpc';
 import { useGlobalStore } from '@/src/providers/global-store-provider';
@@ -16,6 +17,10 @@ export default function Page() {
 
   return (
     <div className="flex w-full flex-col gap-2 p-4">
+      <Metadata
+        title="Org Settings - Members"
+        description="Manage your organization"
+      />
       <div className="flex w-full justify-between">
         <div className="flex flex-col gap-2">
           <h1 className="font-display text-3xl leading-5">Members</h1>
diff --git a/apps/web/src/app/[orgShortCode]/settings/org/users/teams/[teamId]/page.tsx b/apps/web/src/app/[orgShortCode]/settings/org/users/teams/[teamId]/page.tsx
index abe004ee..d9ec5922 100644
--- a/apps/web/src/app/[orgShortCode]/settings/org/users/teams/[teamId]/page.tsx
+++ b/apps/web/src/app/[orgShortCode]/settings/org/users/teams/[teamId]/page.tsx
@@ -1,5 +1,6 @@
 'use client';
 
+import Metadata from '@/src/components/metadata';
 import { Button } from '@/src/components/shadcn-ui/button';
 import { DataTable } from '@/src/components/shared/table';
 import { api } from '@/src/lib/trpc';
@@ -32,6 +33,10 @@ export default function Page({
 
   return (
     <div className="flex h-full w-full flex-col gap-2 p-4">
+      <Metadata
+        title="Org Settings - Teams"
+        description="Manage your organization"
+      />
       <div className="flex w-full gap-4">
         <Button
           asChild
diff --git a/apps/web/src/app/[orgShortCode]/settings/org/users/teams/page.tsx b/apps/web/src/app/[orgShortCode]/settings/org/users/teams/page.tsx
index f759b63a..b37686d4 100644
--- a/apps/web/src/app/[orgShortCode]/settings/org/users/teams/page.tsx
+++ b/apps/web/src/app/[orgShortCode]/settings/org/users/teams/page.tsx
@@ -1,5 +1,6 @@
 'use client';
 
+import Metadata from '@/src/components/metadata';
 import { DataTable } from '@/src/components/shared/table';
 import { api } from '@/src/lib/trpc';
 import { useGlobalStore } from '@/src/providers/global-store-provider';
@@ -15,6 +16,10 @@ export default function Page() {
 
   return (
     <div className="flex w-full flex-col gap-2 p-4">
+      <Metadata
+        title="Org Settings - Teams"
+        description="Manage your organization"
+      />
       <div className="flex w-full justify-between">
         <div className="flex flex-col gap-2">
           <h1 className="font-display text-3xl leading-5">Teams</h1>
diff --git a/apps/web/src/app/[orgShortCode]/settings/user/addresses/page.tsx b/apps/web/src/app/[orgShortCode]/settings/user/addresses/page.tsx
index 82c339a7..afa35ce5 100644
--- a/apps/web/src/app/[orgShortCode]/settings/user/addresses/page.tsx
+++ b/apps/web/src/app/[orgShortCode]/settings/user/addresses/page.tsx
@@ -1,5 +1,6 @@
 'use client';
 
+import Metadata from '@/src/components/metadata';
 import { DataTable } from '@/src/components/shared/table';
 import { useGlobalStore } from '@/src/providers/global-store-provider';
 import { api } from '@/src/lib/trpc';
@@ -32,6 +33,10 @@ export default function Page() {
 
   return (
     <div className="flex flex-col gap-4 p-4">
+      <Metadata
+        title="Settings - Addresses"
+        description="Manage your account"
+      />
       <PageTitle title="Your Addresses" />
 
       {personalAddressesLoading && <Skeleton className="h-10 w-full" />}
diff --git a/apps/web/src/app/[orgShortCode]/settings/user/profile/page.tsx b/apps/web/src/app/[orgShortCode]/settings/user/profile/page.tsx
index a5de348c..958e09bb 100644
--- a/apps/web/src/app/[orgShortCode]/settings/user/profile/page.tsx
+++ b/apps/web/src/app/[orgShortCode]/settings/user/profile/page.tsx
@@ -1,5 +1,6 @@
 'use client';
 
+import Metadata from '@/src/components/metadata';
 import { AvatarModal } from '@/src/components/shared/avatar-modal';
 import { Camera } from '@phosphor-icons/react';
 import { useEffect, useState, useMemo } from 'react';
@@ -84,6 +85,10 @@ export default function Page() {
 
   return (
     <div className="flex flex-col gap-3 p-4">
+      <Metadata
+        title="Settings - Profile"
+        description="Manage your account"
+      />
       <PageTitle title="Your Profile" />
 
       <div className="flex flex-col gap-3">
diff --git a/apps/web/src/app/[orgShortCode]/settings/user/security/page.tsx b/apps/web/src/app/[orgShortCode]/settings/user/security/page.tsx
index 5cbeb311..f73b2d20 100644
--- a/apps/web/src/app/[orgShortCode]/settings/user/security/page.tsx
+++ b/apps/web/src/app/[orgShortCode]/settings/user/security/page.tsx
@@ -1,5 +1,6 @@
 'use client';
 
+import Metadata from '@/src/components/metadata';
 import { useEffect, useState } from 'react';
 import { api } from '@/src/lib/trpc';
 import { VerificationModal } from './_components/verification-modal';
@@ -158,6 +159,10 @@ export default function Page() {
 
   return (
     <div className="flex flex-col gap-4 p-4">
+      <Metadata
+        title="Settings - Security"
+        description="Manage your account"
+      />
       <PageTitle
         title="Security"
         description="Manage your account security"
diff --git a/apps/web/src/app/layout.tsx b/apps/web/src/app/layout.tsx
index 5be3a3ca..26aee48f 100644
--- a/apps/web/src/app/layout.tsx
+++ b/apps/web/src/app/layout.tsx
@@ -1,3 +1,4 @@
+import { TooltipProvider } from '@/src/components/shadcn-ui/tooltip';
 import type { Metadata } from 'next';
 import { Inter } from 'next/font/google';
 import localFont from 'next/font/local';
@@ -55,10 +56,12 @@ export default function RootLayout({
             defaultTheme="system"
             disableTransitionOnChange>
             <div className="flex h-svh w-full flex-col">
-              <TRPCReactProvider>
-                {children}
-                <Toaster />
-              </TRPCReactProvider>
+              <TooltipProvider>
+                <TRPCReactProvider>
+                  {children}
+                  <Toaster />
+                </TRPCReactProvider>
+              </TooltipProvider>
             </div>
           </ThemeProvider>
         </CookiesProvider>
diff --git a/apps/web/src/components/metadata.tsx b/apps/web/src/components/metadata.tsx
new file mode 100644
index 00000000..3e6bd6f7
--- /dev/null
+++ b/apps/web/src/components/metadata.tsx
@@ -0,0 +1,15 @@
+interface MetadataProps {
+  title: string;
+  description: string;
+}
+export default function Metadata({ title, description }: MetadataProps) {
+  return (
+    <>
+      <title>{title}</title>
+      <meta
+        name="description"
+        content={description}
+      />
+    </>
+  );
+}