diff --git a/apps/mail/actions/ai-reply.ts b/apps/mail/actions/ai-reply.ts
index 5f762c8bd9..17272c9a6e 100644
--- a/apps/mail/actions/ai-reply.ts
+++ b/apps/mail/actions/ai-reply.ts
@@ -1,5 +1,6 @@
 'use server';
 
+import { getUserSettings } from '@/actions/settings';
 import { headers } from 'next/headers';
 import { auth } from '@/lib/auth';
 
@@ -7,31 +8,34 @@ import { auth } from '@/lib/auth';
 function truncateThreadContent(threadContent: string, maxTokens: number = 12000): string {
   // Split the thread into individual emails
   const emails = threadContent.split('\n---\n');
-  
+
   // Start with the most recent email (last in the array)
   let truncatedContent = emails[emails.length - 1];
-  
+
   // Add previous emails until we reach the token limit
   for (let i = emails.length - 2; i >= 0; i--) {
     const newContent = `${emails[i]}\n---\n${truncatedContent}`;
-    
+
     // Rough estimation of tokens (1 token ≈ 4 characters)
     const estimatedTokens = newContent.length / 4;
-    
+
     if (estimatedTokens > maxTokens) {
       break;
     }
-    
+
     truncatedContent = newContent;
   }
-  
+
   return truncatedContent;
 }
 
-export async function generateAIResponse(threadContent: string, originalSender: string): Promise<string> {
+export async function generateAIResponse(
+  threadContent: string,
+  originalSender: string,
+): Promise<string> {
   const headersList = await headers();
   const session = await auth.api.getSession({ headers: headersList });
-  
+
   if (!session?.user) {
     throw new Error('Unauthorized');
   }
@@ -40,12 +44,18 @@ export async function generateAIResponse(threadContent: string, originalSender:
     throw new Error('OpenAI API key is not configured');
   }
 
+  // Get user settings to check for custom prompt
+  const userSettings = await getUserSettings();
+  const customPrompt = userSettings?.customPrompt || '';
+
   // Truncate the thread content to fit within token limits
   const truncatedThreadContent = truncateThreadContent(threadContent);
 
   // Create the prompt for OpenAI
   const prompt = `
-  You are ${session.user.name}, writing an email reply.
+  ${process.env.AI_SYSTEM_PROMPT}
+
+ You should write as if your name is ${session.user.name}, who is the user writing an email reply.
   
   Here's the context of the email thread:
   ${truncatedThreadContent}
@@ -54,7 +64,7 @@ export async function generateAIResponse(threadContent: string, originalSender:
   
   Requirements:
   - Be concise but thorough (2-3 paragraphs maximum)
-  - Maintain a professional and friendly tone
+  - Base your reply on the context provided. sometimes there will be an email that needs to be replied in an orderly manner while other times you will want a casual reply. 
   - Address the key points from the original email
   - Close with an appropriate sign-off
   - Don't use placeholder text or mention that you're an AI
@@ -62,6 +72,10 @@ export async function generateAIResponse(threadContent: string, originalSender:
   - Don't include the subject line in the reply
   - Double space paragraphs (2 newlines)
   - Add two spaces bellow the sign-off
+
+Here is some additional information about the user:
+${customPrompt}
+
   `;
 
   try {
@@ -70,14 +84,15 @@ export async function generateAIResponse(threadContent: string, originalSender:
       method: 'POST',
       headers: {
         'Content-Type': 'application/json',
-        'Authorization': `Bearer ${process.env.OPENAI_API_KEY}`,
+        Authorization: `Bearer ${process.env.OPENAI_API_KEY}`,
       },
       body: JSON.stringify({
         model: 'gpt-3.5-turbo',
         messages: [
           {
             role: 'system',
-            content: 'You are a helpful email assistant that generates concise, professional replies.',
+            content:
+              'You are a helpful email assistant that generates concise, professional replies.',
           },
           { role: 'user', content: prompt },
         ],
@@ -97,4 +112,4 @@ export async function generateAIResponse(threadContent: string, originalSender:
     console.error('OpenAI API Error:', error);
     throw new Error(`OpenAI API Error: ${error.message || 'Unknown error'}`);
   }
-} 
\ No newline at end of file
+}
diff --git a/apps/mail/app/(routes)/settings/general/page.tsx b/apps/mail/app/(routes)/settings/general/page.tsx
index a6d31c2819..4cc226c715 100644
--- a/apps/mail/app/(routes)/settings/general/page.tsx
+++ b/apps/mail/app/(routes)/settings/general/page.tsx
@@ -30,12 +30,14 @@ import * as z from 'zod';
 import { useSettings } from '@/hooks/use-settings';
 import { getBrowserTimezone } from '@/lib/timezones';
 import { saveUserSettings } from '@/actions/settings';
+import { Textarea } from '@/components/ui/textarea';
 
 const formSchema = z.object({
   language: z.enum(locales as [string, ...string[]]),
   timezone: z.string(),
   dynamicContent: z.boolean(),
   externalImages: z.boolean(),
+  customPrompt: z.string(),
 });
 
 export default function GeneralPage() {
@@ -51,6 +53,7 @@ export default function GeneralPage() {
       timezone: getBrowserTimezone(),
       dynamicContent: false,
       externalImages: true,
+      customPrompt: "",
     },
   });
 
@@ -189,6 +192,25 @@ export default function GeneralPage() {
                 )}
               />
             </div>
+            <FormField
+              control={form.control}
+              name="customPrompt"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>{t('pages.settings.general.customPrompt')}</FormLabel>
+                  <FormControl>
+                    <Textarea
+                      placeholder={t('pages.settings.general.customPromptPlaceholder')}
+                      className="min-h-[350px]"
+                      {...field}
+                    />
+                  </FormControl>
+                  <FormDescription>
+                    {t('pages.settings.general.customPromptDescription')}
+                  </FormDescription>
+                </FormItem>
+              )}
+            />
           </form>
         </Form>
       </SettingsCard>
diff --git a/apps/mail/components/create/editor.tsx b/apps/mail/components/create/editor.tsx
index 30b1f9471d..234fb59fee 100644
--- a/apps/mail/components/create/editor.tsx
+++ b/apps/mail/components/create/editor.tsx
@@ -74,6 +74,7 @@ interface EditorProps {
   className?: string;
   onCommandEnter?: () => void;
   onAttachmentsChange?: (attachments: File[]) => void;
+  onTab?: () => boolean;
 }
 
 interface EditorState {
@@ -378,6 +379,7 @@ export default function Editor({
   onBlur,
   className,
   onCommandEnter,
+  onTab,
   onAttachmentsChange,
 }: EditorProps) {
   const [state, dispatch] = useReducer(editorReducer, {
@@ -468,7 +470,15 @@ export default function Editor({
       className={`relative w-full max-w-[450px] sm:max-w-[600px] ${className || ''}`}
       onClick={focusEditor}
       onKeyDown={(e) => {
-        // Prevent form submission on Enter key
+        // Handle tab key
+        if (e.key === 'Tab' && !e.shiftKey) {
+          if (onTab && onTab()) {
+            e.preventDefault();
+            e.stopPropagation();
+            return;
+          }
+        }
+
         if (e.key === 'Enter' && !e.shiftKey) {
           e.stopPropagation();
         }
@@ -491,6 +501,14 @@ export default function Editor({
           editorProps={{
             handleDOMEvents: {
               keydown: (view, event) => {
+                // Handle tab key
+                if (event.key === 'Tab' && !event.shiftKey) {
+                  if (onTab && onTab()) {
+                    event.preventDefault();
+                    return true;
+                  }
+                }
+                
                 // Handle Command+Enter (Mac) or Ctrl+Enter (Windows/Linux)
                 if (event.key === 'Enter' && (event.metaKey || event.ctrlKey)) {
                   event.preventDefault();
diff --git a/apps/mail/components/mail/mail-list.tsx b/apps/mail/components/mail/mail-list.tsx
index c978743690..f01f0f70bc 100644
--- a/apps/mail/components/mail/mail-list.tsx
+++ b/apps/mail/components/mail/mail-list.tsx
@@ -493,7 +493,7 @@ export const MailList = memo(({ isCompact }: MailListProps) => {
         ref={parentRef}
         className={cn('h-full w-full', getSelectMode() === 'range' && 'select-none')}
       >
-        <ScrollArea className="hide-scrollbar h-full overflow-auto pb-4">
+        <ScrollArea className="hide-scrollbar h-full overflow-auto">
           {items.map((data, index) => {
             return (
               <Thread
@@ -510,8 +510,22 @@ export const MailList = memo(({ isCompact }: MailListProps) => {
               />
             );
           })}
-          <Button variant={'ghost'} className="w-full" onClick={handleScroll}>
-            Load more <ChevronDown />
+          <Button 
+            variant={'ghost'} 
+            className="w-full rounded-none" 
+            onClick={handleScroll}
+            disabled={isLoading || isValidating}
+          >
+            {isLoading || isValidating ? (
+              <div className="flex items-center gap-2">
+                <div className="h-4 w-4 animate-spin rounded-full border-2 border-neutral-900 border-t-transparent dark:border-white dark:border-t-transparent" />
+                Loading...
+              </div>
+            ) : (
+              <>
+                Load more <ChevronDown />
+              </>
+            )}
           </Button>
         </ScrollArea>
       </div>
diff --git a/apps/mail/components/mail/reply-composer.tsx b/apps/mail/components/mail/reply-composer.tsx
index 8806ebeba7..9cccb5e105 100644
--- a/apps/mail/components/mail/reply-composer.tsx
+++ b/apps/mail/components/mail/reply-composer.tsx
@@ -215,8 +215,12 @@ export default function ReplyCompose({ emailData, isOpen, setIsOpen }: ReplyComp
     },
   });
 
+  // Add a loading state
+  const [isSubmitting, setIsSubmitting] = useState(false);
+
   const handleSendEmail = async (e: React.MouseEvent<HTMLButtonElement>) => {
     e.preventDefault();
+    setIsSubmitting(true); // Set loading state to true before sending
     try {
       const originalSubject = emailData[0]?.subject || '';
       const subject = originalSubject.startsWith('Re:')
@@ -265,6 +269,8 @@ export default function ReplyCompose({ emailData, isOpen, setIsOpen }: ReplyComp
     } catch (error) {
       console.error('Error sending email:', error);
       toast.error(t('pages.createEmail.failedToSendEmail'));
+    } finally {
+      setIsSubmitting(false); // Reset loading state regardless of outcome
     }
   };
 
@@ -336,6 +342,15 @@ ${email.decodedBody || 'No content'}
       });
       composerDispatch({ type: 'INCREMENT_EDITOR_KEY' });
       aiDispatch({ type: 'SET_SHOW_OPTIONS', payload: true });
+
+      // Add this: Focus the editor after AI content is set
+      setTimeout(() => {
+        const editorElement = document.querySelector('.ProseMirror');
+        if (editorElement instanceof HTMLElement) {
+          editorElement.focus();
+        }
+      }, 100); // Small delay to ensure content is rendered
+
     } catch (error: any) {
       console.error('Error generating AI response:', error);
       
@@ -373,6 +388,24 @@ ${email.decodedBody || 'No content'}
     aiDispatch({ type: 'RESET' });
   };
 
+  // Create a ref for the send button
+  const sendButtonRef = useRef<HTMLButtonElement>(null);
+
+  // Update the Editor's onCommandEnter prop
+  const handleCommandEnter = () => {
+    // Programmatically click the send button
+    sendButtonRef.current?.click();
+  };
+
+  // Add a handler for tab key acceptance
+  const handleTabAccept = useCallback(() => {
+    if (aiState.showOptions && aiState.suggestion) {
+      acceptAISuggestion();
+      return true; // Return true to indicate we handled the tab
+    }
+    return false; // Return false to allow normal tab behavior
+  }, [aiState.showOptions, aiState.suggestion]);
+
   if (!composerIsOpen) {
     return (
       <div className="bg-offsetLight dark:bg-offsetDark w-full p-2">
@@ -437,12 +470,7 @@ ${email.decodedBody || 'No content'}
           </Button>
         </div>
 
-        {aiState.showOptions && (
-          <div className="flex items-center gap-2 px-2 py-1 bg-blue-50 dark:bg-blue-950 rounded-md text-xs">
-            <Sparkles className="h-3.5 w-3.5 text-[#016FFE]" />
-            <span className="text-[#016FFE] dark:text-[#016FFE]">AI reply suggestion. Review and edit before sending.</span>
-          </div>
-        )}
+        
 
         <div className="w-full flex-grow">
           <div className="min-h-[150px] max-h-[800px] w-full overflow-y-auto">
@@ -452,9 +480,13 @@ ${email.decodedBody || 'No content'}
                 form.setValue('messageContent', content);
               }}
               initialValue={composerState.editorInitialValue}
+              onCommandEnter={handleCommandEnter}
+              onTab={handleTabAccept}
+              disabled={isSubmitting}
               className={cn(
                 "sm:max-w-[600px] md:max-w-[2050px]",
-                aiState.showOptions ? "border border-blue-200 dark:border-blue-800 rounded-md bg-blue-50/30 dark:bg-blue-950/30 p-1" : ""
+                aiState.showOptions ? "border border-blue-200 dark:border-blue-800 border-dotted rounded-md bg-blue-50/30 dark:bg-blue-950/30 p-1" : "p-1 border border-transparent",
+                isSubmitting ? "opacity-50 cursor-not-allowed" : ""
               )}
               placeholder={aiState.showOptions ? "AI-generated reply (you can edit)" : "Type your reply here..."}
               onFocus={() => {
@@ -467,6 +499,12 @@ ${email.decodedBody || 'No content'}
           </div>
         </div>
 
+        {aiState.showOptions && (
+          <div className="text-xs text-muted-foreground ml-2 mt-1">
+            Press <kbd className="px-1 py-0.5 bg-muted rounded">Tab</kbd> to accept
+          </div>
+        )}
+
         <div className="mt-auto flex items-center justify-between">
           <div className="flex items-center gap-2">
             
@@ -493,26 +531,28 @@ ${email.decodedBody || 'No content'}
             ) : (
               <div className="flex items-center gap-1">
                 <Button
-                  variant="outline"
-                  size="icon"
-                  className="h-9 w-9"
+                  variant="ghost"
+                  className='hover:bg-transparent w-20 border h-9 px-12 dark:text-black text-white bg-black dark:bg-white'
+                 
                   onClick={(e) => {
                     e.preventDefault();
                     acceptAISuggestion();
                   }}
                 >
-                  <Check className="h-5 w-5 text-green-500" />
+                  <Check className="h-5 w-5" />
+                  Accept
                 </Button>
                 <Button
-                  variant="outline"
-                  size="icon"
-                  className="h-9 w-9"
+                  variant="ghost"
+                 
+                  className='hover:bg-transparent w-20 dark:text-white/50 text-black/50'
                   onClick={(e) => {
                     e.preventDefault();
                     rejectAISuggestion();
                   }}
                 >
-                  <XIcon className="h-5 w-5 text-red-500" />
+                  <XIcon className="h-5 w-5" />
+                  Reject
                 </Button>
               </div>
             )}
@@ -578,19 +618,28 @@ ${email.decodedBody || 'No content'}
             />
           </div>
           <div className="mr-2 flex items-center gap-2">
-            <Button variant="ghost" size="sm" className="h-8">
+            <Button 
+              variant="ghost" 
+              size="sm" 
+              className="h-8"
+              disabled={isSubmitting}
+            >
               {t('common.replyCompose.saveDraft')}
             </Button>
             <Button
+              ref={sendButtonRef}
               size="sm"
-              className="rounded-full relative h-8 w-8"
+              className={cn(
+                "rounded-full relative h-8 w-8",
+                isSubmitting && "cursor-not-allowed"
+              )}
               onClick={async (e) => {
                 e.preventDefault();
                 await handleSendEmail(e);
               }}
+              disabled={isSubmitting}
               type="button"
             >
-              
               <ArrowUp className="h-4 w-4" />
             </Button>
           </div>
@@ -599,3 +648,5 @@ ${email.decodedBody || 'No content'}
     </div>
   );
 }
+
+
diff --git a/apps/mail/locales/en.json b/apps/mail/locales/en.json
index 397c133352..5dc11b721a 100644
--- a/apps/mail/locales/en.json
+++ b/apps/mail/locales/en.json
@@ -264,7 +264,10 @@
         "dynamicContentDescription": "Allow emails to display dynamic content.",
         "externalImages": "Display External Images",
         "externalImagesDescription": "Allow emails to display images from external sources.",
-        "languageChangedTo": "Language changed to {language}"
+        "languageChangedTo": "Language changed to {locale}",
+        "customPrompt": "Custom AI Prompt",
+        "customPromptPlaceholder": "Enter your custom prompt for the AI...",
+        "customPromptDescription": "Customize how the AI writes your email replies. This will be added to the base prompt."
       },
       "connections": {
         "title": "Email Connections",
diff --git a/packages/db/src/schema.ts b/packages/db/src/schema.ts
index cd7c7ea614..36257bffeb 100644
--- a/packages/db/src/schema.ts
+++ b/packages/db/src/schema.ts
@@ -12,6 +12,7 @@ export const user = createTable("user", {
   createdAt: timestamp("created_at").notNull(),
   updatedAt: timestamp("updated_at").notNull(),
   defaultConnectionId: text("default_connection_id"),
+  customPrompt: text("custom_prompt"),
 });
 
 export const session = createTable("session", {
diff --git a/packages/db/src/user_settings_default.ts b/packages/db/src/user_settings_default.ts
index 3d0e709727..f0aa02a8d6 100644
--- a/packages/db/src/user_settings_default.ts
+++ b/packages/db/src/user_settings_default.ts
@@ -5,6 +5,7 @@ export const defaultUserSettings = {
     timezone: "UTC",
     dynamicContent: false,
     externalImages: true,
+    customPrompt: "",
 };
 
 export const userSettingsSchema = z.object({
@@ -12,6 +13,7 @@ export const userSettingsSchema = z.object({
     timezone: z.string(),
     dynamicContent: z.boolean(),
     externalImages: z.boolean(),
+    customPrompt: z.string(),
 });
 
 export type UserSettings = typeof defaultUserSettings;
\ No newline at end of file