diff --git a/apps/mail/app/(routes)/create/layout.tsx b/apps/mail/app/(routes)/create/layout.tsx
deleted file mode 100644
index ea1b5a325f..0000000000
--- a/apps/mail/app/(routes)/create/layout.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import { AppSidebar } from '@/components/ui/app-sidebar';
-
-export default function CreateLayout({ children }: { children: React.ReactNode }) {
-  return (
-    <>
-      <AppSidebar />
-      <div className="w-full bg-white md:p-3 dark:bg-black">{children}</div>
-    </>
-  );
-}
diff --git a/apps/mail/app/(routes)/create/page.tsx b/apps/mail/app/(routes)/create/page.tsx
deleted file mode 100644
index 10c2e6443c..0000000000
--- a/apps/mail/app/(routes)/create/page.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import { CreateEmail } from '@/components/create/create-email';
-
-export default function CreatePage() {
-  return (
-    <div className="flex h-full w-full flex-col">
-      <div className="h-full flex-1">
-        <CreateEmail />
-      </div>
-    </div>
-  );
-}
diff --git a/apps/mail/app/(routes)/mail/[folder]/page.tsx b/apps/mail/app/(routes)/mail/[folder]/page.tsx
index ca043577af..51e33670f8 100644
--- a/apps/mail/app/(routes)/mail/[folder]/page.tsx
+++ b/apps/mail/app/(routes)/mail/[folder]/page.tsx
@@ -1,4 +1,7 @@
 import { MailLayout } from '@/components/mail/mail';
+import { redirect } from 'next/navigation';
+import { auth } from '@/lib/auth';
+import { headers } from 'next/headers';
 
 interface MailPageProps {
   params: Promise<{
@@ -9,6 +12,13 @@ interface MailPageProps {
 const ALLOWED_FOLDERS = ['inbox', 'draft', 'sent', 'spam', 'trash', 'archive'];
 
 export default async function MailPage({ params }: MailPageProps) {
+  const headersList = await headers();
+  const session = await auth.api.getSession({ headers: headersList });
+  
+  if (!session) {
+    redirect('/');
+  }
+
   const { folder } = await params;
 
   if (!ALLOWED_FOLDERS.includes(folder)) {
diff --git a/apps/mail/app/(routes)/mail/create/page.tsx b/apps/mail/app/(routes)/mail/create/page.tsx
index 10c2e6443c..d921454e58 100644
--- a/apps/mail/app/(routes)/mail/create/page.tsx
+++ b/apps/mail/app/(routes)/mail/create/page.tsx
@@ -1,6 +1,16 @@
 import { CreateEmail } from '@/components/create/create-email';
+import { auth } from '@/lib/auth';
+import { headers } from 'next/headers';
+import { redirect } from 'next/navigation';
+
+export default async function CreatePage() {
+  const headersList = await headers();
+  const session = await auth.api.getSession({ headers: headersList });
+  
+  if (!session) {
+    redirect('/');
+  }
 
-export default function CreatePage() {
   return (
     <div className="flex h-full w-full flex-col">
       <div className="h-full flex-1">