diff --git a/.flake8 b/.flake8
index 4b852abd7..06fe235c0 100644
--- a/.flake8
+++ b/.flake8
@@ -25,6 +25,7 @@ ignore =
     W503,
     W504,
     F403,
+    F811,
     B007,
     B950,
     W191,
diff --git a/.github/helper/flake8.conf b/.github/helper/flake8.conf
index 8a97e17c9..e6f31158d 100644
--- a/.github/helper/flake8.conf
+++ b/.github/helper/flake8.conf
@@ -57,6 +57,7 @@ ignore =
     F401,
     F403,
     F405,
+    F811,
     W191,
     W291,
     W292,
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index 696d9596f..627715b63 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -18,7 +18,8 @@ const NO_CACHE_KEYS = [
   "frappe.desk.search.search_link",
   "frappe.model.workflow.get_transitions",
   "frappe.desk.reportview.get_count",
-  "frappe.core.doctype.server_script.server_script.enabled"
+  "frappe.core.doctype.server_script.server_script.enabled",
+  "raven.api.message_actions.get_action_defaults"
 ]
 
 
@@ -80,21 +81,17 @@ const router = createBrowserRouter(
                 <Route path="create" lazy={() => import('./pages/settings/ServerScripts/SchedulerEvents/CreateSchedulerEvent')} />
                 <Route path=":ID" lazy={() => import('./pages/settings/ServerScripts/SchedulerEvents/ViewSchedulerEvent')} />
               </Route>
+
+              <Route path="message-actions">
+                <Route index lazy={() => import('./pages/settings/MessageActions/MessageActionList')} />
+                <Route path="create" lazy={() => import('./pages/settings/MessageActions/CreateMessageAction')} />
+                <Route path=":ID" lazy={() => import('./pages/settings/MessageActions/ViewMessageAction')} />
+              </Route>
             </Route>
             <Route path=":channelID" lazy={() => import('@/pages/ChatSpace')}>
               <Route path="thread/:threadID" lazy={() => import('./components/feature/threads/ThreadDrawer/ThreadDrawer')} />
             </Route>
           </Route>
-          {/* <Route path='settings' lazy={() => import('./pages/settings/Settings')}>
-            <Route path='integrations'>
-              <Route path='webhooks' lazy={() => import('./pages/settings/Webhooks/WebhookList')} />
-              <Route path='webhooks/create' lazy={() => import('./pages/settings/Webhooks/CreateWebhook')} />
-              <Route path='webhooks/:ID' lazy={() => import('./pages/settings/Webhooks/ViewWebhook')} />
-              <Route path='scheduled-messages' lazy={() => import('./pages/settings/ServerScripts/SchedulerEvents/SchedulerEvents')} />
-              <Route path='scheduled-messages/create' lazy={() => import('./pages/settings/ServerScripts/SchedulerEvents/CreateSchedulerEvent')} />
-              <Route path='scheduled-messages/:ID' lazy={() => import('./pages/settings/ServerScripts/SchedulerEvents/ViewSchedulerEvent')} />
-            </Route>
-          </Route> */}
         </Route>
       </Route>
       <Route path='*' lazy={() => import('./pages/NotFound')} />
diff --git a/frontend/src/components/feature/CommandMenu/CommandMenu.tsx b/frontend/src/components/feature/CommandMenu/CommandMenu.tsx
index cb505be87..939198045 100644
--- a/frontend/src/components/feature/CommandMenu/CommandMenu.tsx
+++ b/frontend/src/components/feature/CommandMenu/CommandMenu.tsx
@@ -6,8 +6,6 @@ import './commandMenu.styles.css'
 import ChannelList from './ChannelList'
 import UserList from './UserList'
 import clsx from 'clsx'
-import { BiCog, BiFile, BiMoon, BiSearch, BiSmile } from 'react-icons/bi'
-import ArchivedChannelList from './ArchivedChannelList'
 import { atom, useAtom } from 'jotai'
 import { useIsDesktop } from '@/hooks/useMediaQuery'
 import { Drawer, DrawerContent } from '@/components/layout/Drawer'
diff --git a/frontend/src/components/feature/CommandMenu/SettingsList.tsx b/frontend/src/components/feature/CommandMenu/SettingsList.tsx
index adc0cb403..b39d3341e 100644
--- a/frontend/src/components/feature/CommandMenu/SettingsList.tsx
+++ b/frontend/src/components/feature/CommandMenu/SettingsList.tsx
@@ -1,6 +1,6 @@
 import { Command } from 'cmdk'
 import { useSetAtom } from 'jotai'
-import { BiBot, BiFile, BiGroup, BiMessageSquareDots, BiUserCircle } from 'react-icons/bi'
+import { BiBoltCircle, BiBot, BiFile, BiGroup, BiMessageSquareDots, BiTime, BiUserCircle } from 'react-icons/bi'
 import { useNavigate } from 'react-router-dom'
 import { commandMenuOpenAtom } from './CommandMenu'
 import { PiOpenAiLogo } from 'react-icons/pi'
@@ -47,12 +47,17 @@ const SettingsList = (props: Props) => {
                 HR
             </Command.Item>
 
+            <Command.Item value='message-actions' onSelect={onSelect}>
+                <BiBoltCircle size={ICON_SIZE} />
+                Message Actions
+            </Command.Item>
+
             <Command.Item value='scheduled-messages' keywords={['scheduled messages']} onSelect={onSelect}>
-                <BiMessageSquareDots size={ICON_SIZE} />
+                <BiTime size={ICON_SIZE} />
                 Scheduled Messages
             </Command.Item>
 
-            <Command.Item value='webhooks' keywords={['webhooks']} onSelect={onSelect}>
+            <Command.Item value='webhooks' onSelect={onSelect}>
                 <AiOutlineApi size={ICON_SIZE} />
                 Webhooks
             </Command.Item>
diff --git a/frontend/src/components/feature/chat/ChatMessage/MessageActions/MessageActionSubMenu.tsx b/frontend/src/components/feature/chat/ChatMessage/MessageActions/MessageActionSubMenu.tsx
new file mode 100644
index 000000000..25e3cef96
--- /dev/null
+++ b/frontend/src/components/feature/chat/ChatMessage/MessageActions/MessageActionSubMenu.tsx
@@ -0,0 +1,65 @@
+import { ContextMenu, Flex, Text } from '@radix-ui/themes'
+import { BiBoltCircle } from 'react-icons/bi'
+import { useFrappeGetDocList } from 'frappe-react-sdk'
+import { RavenMessageAction } from '@/types/RavenIntegrations/RavenMessageAction'
+import { useSetAtom } from 'jotai'
+import { messageActionAtom } from '@/components/feature/message-actions/MessageActionController'
+
+type Props = {
+    messageID: string,
+}
+
+const MessageActionSubMenu = (props: Props) => {
+    return <ContextMenu.Sub>
+        <ContextMenu.SubTrigger>
+            <Flex gap='2' align='center'>
+                <BiBoltCircle size={'18'} />
+                Actions
+            </Flex>
+        </ContextMenu.SubTrigger>
+        <ContextMenu.SubContent>
+            <MessageActionSubMenuContent {...props} />
+            {/* <ContextMenu.Separator />
+            <ContextMenu.Item>
+                <HStack align='center' justify='between' width='100%'>
+                    Create Action <BiLinkExternal size='16' />
+                </HStack>
+            </ContextMenu.Item> */}
+        </ContextMenu.SubContent>
+    </ContextMenu.Sub>
+}
+
+export default MessageActionSubMenu
+
+
+const MessageActionSubMenuContent = (props: Props) => {
+
+    const { data } = useFrappeGetDocList<RavenMessageAction>("Raven Message Action", {
+        fields: ['name', 'action_name'],
+        filters: [
+            ['enabled', '=', 1]
+        ],
+        orderBy: {
+            field: 'action',
+            order: 'asc'
+        }
+    }, undefined, {
+        revalidateOnFocus: false,
+    })
+
+    const setMessageAction = useSetAtom(messageActionAtom)
+
+    return <>
+        {data && data.length > 0 ? data?.map((action) => {
+            return <ContextMenu.Item key={action.name} onClick={() => setMessageAction({ actionID: action.name, messageID: props.messageID })}>
+                <Text size='2' weight='medium'>
+                    {action.action_name}
+                </Text>
+            </ContextMenu.Item>
+        })
+
+            : <ContextMenu.Item disabled>
+                No Actions Available
+            </ContextMenu.Item>}
+    </>
+}
\ No newline at end of file
diff --git a/frontend/src/components/feature/chat/ChatMessage/MessageActions/MessageActions.tsx b/frontend/src/components/feature/chat/ChatMessage/MessageActions/MessageActions.tsx
index 7a224638a..db1419c18 100644
--- a/frontend/src/components/feature/chat/ChatMessage/MessageActions/MessageActions.tsx
+++ b/frontend/src/components/feature/chat/ChatMessage/MessageActions/MessageActions.tsx
@@ -12,6 +12,7 @@ import { AiOutlineEdit } from 'react-icons/ai'
 import { LuForward, LuReply } from 'react-icons/lu'
 import { MdOutlineEmojiEmotions } from "react-icons/md";
 import { CreateThreadContextItem } from './QuickActions/CreateThreadButton'
+import MessageActionSubMenu from './MessageActionSubMenu'
 
 export interface MessageContextMenuProps {
     message?: Message | null,
@@ -103,6 +104,8 @@ export const MessageContextMenu = ({ message, onDelete, onEdit, onReply, onForwa
                     </ContextMenu.Item>
                 </ContextMenu.Group>}
 
+                <MessageActionSubMenu messageID={message.name} />
+
                 {isOwner && <ContextMenu.Group>
                     <ContextMenu.Separator />
                     {message.message_type === 'Text' &&
diff --git a/frontend/src/components/feature/message-actions/MessageActionController.tsx b/frontend/src/components/feature/message-actions/MessageActionController.tsx
new file mode 100644
index 000000000..c79be5249
--- /dev/null
+++ b/frontend/src/components/feature/message-actions/MessageActionController.tsx
@@ -0,0 +1,30 @@
+import { atom, useAtom } from 'jotai'
+import MessageActionModal from './MessageActionModal'
+
+type MessageActionAtomType = {
+    actionID: string,
+    messageID: string
+}
+export const messageActionAtom = atom<MessageActionAtomType>({
+    actionID: '',
+    messageID: ''
+})
+
+const MessageActionController = () => {
+
+    const [messageAction, setMessageAction] = useAtom(messageActionAtom)
+
+    const closeMessageAction = () => {
+        setMessageAction({ actionID: '', messageID: '' })
+    }
+
+    return (
+        <MessageActionModal
+            actionID={messageAction.actionID}
+            messageID={messageAction.messageID}
+            onClose={closeMessageAction}
+        />
+    )
+}
+
+export default MessageActionController
\ No newline at end of file
diff --git a/frontend/src/components/feature/message-actions/MessageActionForm.tsx b/frontend/src/components/feature/message-actions/MessageActionForm.tsx
new file mode 100644
index 000000000..4771a9eb8
--- /dev/null
+++ b/frontend/src/components/feature/message-actions/MessageActionForm.tsx
@@ -0,0 +1,196 @@
+import { ErrorText, HelperText, Label } from '@/components/common/Form'
+import LinkFormField from '@/components/common/LinkField/LinkFormField'
+import { HStack, Stack } from '@/components/layout/Stack'
+import { RavenMessageAction } from '@/types/RavenIntegrations/RavenMessageAction'
+import { Box, Checkbox, Grid, Select, Text, TextArea, TextField } from '@radix-ui/themes'
+import { Tabs } from '@radix-ui/themes'
+import { ChangeEvent } from 'react'
+import { Controller, useFormContext } from 'react-hook-form'
+import { BiBoltCircle } from 'react-icons/bi'
+import { LuVariable } from 'react-icons/lu'
+import MessageActionVariableBuilder from './MessageActionVariableBuilder'
+
+const ICON_PROPS = {
+    size: 18,
+    className: 'mr-1.5'
+}
+
+
+const MessageActionForm = () => {
+    return (
+        <Tabs.Root defaultValue='general'>
+            <Tabs.List>
+                <Tabs.Trigger value='general'><BiBoltCircle {...ICON_PROPS} /> General</Tabs.Trigger>
+                <Tabs.Trigger value='fields'><LuVariable {...ICON_PROPS} /> Fields</Tabs.Trigger>
+            </Tabs.List>
+            <Box pt='4'>
+                <Tabs.Content value='general'>
+                    <GeneralTab />
+                </Tabs.Content>
+                <Tabs.Content value='fields'>
+                    <MessageActionVariableBuilder />
+                </Tabs.Content>
+            </Box>
+        </Tabs.Root>
+    )
+}
+
+export default MessageActionForm
+
+
+const GeneralTab = () => {
+    const { register, control, formState: { errors }, setValue, watch } = useFormContext<RavenMessageAction>()
+
+    const action = watch('action')
+
+    const onActionChange = (event: ChangeEvent<HTMLSelectElement>) => {
+
+        if (event.target.value !== 'Custom Function') {
+            setValue('custom_function_path', '')
+        }
+
+        if (event.target.value !== "Create Document") {
+            setValue('document_type', '')
+        }
+    }
+    return <Stack gap='4'>
+
+        <Grid columns={'2'} gap='4' align='center'>
+            <Stack>
+                <Box>
+                    <Label htmlFor='action_name' isRequired>Name</Label>
+                    <TextField.Root
+                        id='action_name'
+                        {...register('action_name', {
+                            required: 'Name is required',
+                            onBlur: (e) => {
+                                setValue('title', e.target.value.trim())
+                            }
+                        })}
+                        placeholder="Create support ticket"
+                        aria-invalid={errors.action_name ? 'true' : 'false'}
+                    />
+                </Box>
+                {errors.action_name && <ErrorText>{errors.action_name?.message}</ErrorText>}
+            </Stack>
+            <Stack>
+                <Box>
+                    <Label htmlFor='action' isRequired>Action Type</Label>
+                    <Controller
+                        control={control}
+                        name='action'
+                        rules={{
+                            required: 'Action Type is required',
+                            onChange: onActionChange
+                        }}
+                        render={({ field }) => (
+                            <Select.Root value={field.value} name={field.name} onValueChange={(value) => field.onChange(value)}>
+                                <Select.Trigger placeholder='Pick an action type' className='w-full' autoFocus />
+                                <Select.Content>
+                                    <Select.Item value='Create Document'>Create Document</Select.Item>
+                                    <Select.Item value='Custom Function'>Custom Function</Select.Item>
+                                </Select.Content>
+                            </Select.Root>
+                        )}
+                    />
+                </Box>
+                {errors.action && <ErrorText>{errors.action?.message}</ErrorText>}
+            </Stack>
+            {action === "Create Document" && <Stack>
+                <LinkFormField
+                    name='document_type'
+                    label='Document Type'
+                    required
+                    filters={[["istable", "=", 0], ["issingle", "=", 0]]}
+                    doctype='DocType'
+                    rules={{
+                        required: action === "Create Document" ? 'Document Type is required' : false,
+                    }}
+                />
+                <HelperText>
+                    The document you want this action to create.
+                </HelperText>
+                {errors.document_type && <ErrorText>{errors.document_type?.message}</ErrorText>}
+            </Stack>}
+
+            {action === 'Custom Function' && <Stack>
+                <Box>
+                    <Label htmlFor='custom_function_path' isRequired={action === 'Custom Function'}>Custom Function Path</Label>
+                    <TextArea
+                        id='custom_function_path'
+                        {...register('custom_function_path', {
+                            required: action === 'Custom Function' ? 'Path is required' : false,
+                            validate: (value) => {
+                                if (value?.includes(' ')) {
+                                    return 'Path cannot contain spaces'
+                                }
+                                return true
+                            }
+                        })}
+                        placeholder='myapp.api.my_custom_function'
+                    />
+                </Box>
+                <HelperText>
+                    Dotted path to the custom function/API. Cannot contain spaces.
+                </HelperText>
+                {errors.custom_function_path && <ErrorText>{errors.custom_function_path?.message}</ErrorText>}
+            </Stack>}
+
+        </Grid>
+        <Stack>
+            <Text as="label" size="2">
+                <HStack>
+                    <Controller
+                        control={control}
+                        name='enabled'
+                        render={({ field }) => (
+                            <Checkbox
+                                checked={field.value ? true : false}
+                                onCheckedChange={(v) => field.onChange(v ? 1 : 0)}
+                            />
+                        )} />
+
+                    Enabled
+                </HStack>
+            </Text>
+        </Stack>
+        <Stack>
+            <Box>
+                <Label htmlFor='title' isRequired>Title</Label>
+                <TextField.Root
+                    id='title'
+                    {...register('title', {
+                        required: 'Title is required',
+                    })}
+                    placeholder="Create support ticket"
+                    aria-invalid={errors.title ? 'true' : 'false'}
+                />
+            </Box>
+            <HelperText>Title of the message action dialog.</HelperText>
+            {errors.title && <ErrorText>{errors.title?.message}</ErrorText>}
+        </Stack>
+
+
+        <Stack>
+            <Box>
+                <Label htmlFor='description'>Description</Label>
+                <TextArea {...register('description')} id='description' placeholder='Create a support ticket from the message.' />
+            </Box>
+            {errors.description && <ErrorText>{errors.description?.message}</ErrorText>}
+            <HelperText>This is shown on the message action dialog.</HelperText>
+        </Stack>
+
+        <Stack>
+            <Box>
+                <Label htmlFor='success_message'>Success Message</Label>
+                <TextArea {...register('success_message')} id='success_message' placeholder='Ticket created successfully.' />
+            </Box>
+            {errors.success_message && <ErrorText>{errors.success_message?.message}</ErrorText>}
+            <HelperText>The message shown in the toast after performing the action.</HelperText>
+        </Stack>
+    </Stack>
+}
+
+const VariablesTab = () => {
+    return <></>
+}
\ No newline at end of file
diff --git a/frontend/src/components/feature/message-actions/MessageActionModal.tsx b/frontend/src/components/feature/message-actions/MessageActionModal.tsx
new file mode 100644
index 000000000..08b59511f
--- /dev/null
+++ b/frontend/src/components/feature/message-actions/MessageActionModal.tsx
@@ -0,0 +1,318 @@
+import { RavenMessageAction } from "@/types/RavenIntegrations/RavenMessageAction"
+import { DIALOG_CONTENT_CLASS } from "@/utils/layout/dialog"
+import { Box, Button, Checkbox, Dialog, Select, Text, TextArea, TextField } from "@radix-ui/themes"
+import clsx from "clsx"
+import { useFrappeGetCall, useFrappeGetDoc, useFrappePostCall } from "frappe-react-sdk"
+import { Controller, FormProvider, useForm, useFormContext } from "react-hook-form"
+import { HStack, Stack } from "@/components/layout/Stack"
+import { RavenMessageActionFields } from "@/types/RavenIntegrations/RavenMessageActionFields"
+import { ErrorText, HelperText, Label } from "@/components/common/Form"
+import LinkFormField from "@/components/common/LinkField/LinkFormField"
+import { useEffect } from "react"
+import { ErrorBanner } from "@/components/layout/AlertBanner"
+import { useSetAtom } from "jotai"
+import { messageActionAtom } from "./MessageActionController"
+import { toast } from "sonner"
+import { Loader } from "@/components/common/Loader"
+
+interface MessageActionModalProps {
+    messageID: string,
+    actionID: string,
+    onClose: () => void
+}
+
+const MessageActionModal = ({ messageID, actionID, onClose }: MessageActionModalProps) => {
+
+    const { data: action } = useFrappeGetDoc<RavenMessageAction>("Raven Message Action", actionID)
+
+    return <Dialog.Root open={actionID !== ''} onOpenChange={onClose}>
+        {action &&
+            <Dialog.Content className={clsx(DIALOG_CONTENT_CLASS)}>
+
+                <Dialog.Title>{action.title}</Dialog.Title>
+                <Dialog.Description size='2'>{action.description ? action.description : action.action}</Dialog.Description>
+
+                <MessageActionDialogContent action={action} messageID={messageID} />
+
+            </Dialog.Content>
+        }
+
+    </Dialog.Root>
+
+}
+
+export default MessageActionModal
+
+const MessageActionDialogContent = ({ action, messageID }: { action: RavenMessageAction, messageID: string }) => {
+
+    // Fetch the form default values for the action and message
+    const { data, error } = useFrappeGetCall('raven.api.message_actions.get_action_defaults', {
+        action_id: action.name,
+        message_id: messageID
+    }, undefined, {
+        revalidateOnFocus: false
+    })
+
+    return <Stack pt='4'>
+        {error && <ErrorBanner error={error} />}
+        <MessageActionForm action={action} messageID={messageID} defaultValues={data?.message} />
+    </Stack>
+}
+
+const MessageActionForm = ({ action, messageID, defaultValues }: { action: RavenMessageAction, messageID: string, defaultValues?: Record<string, any> }) => {
+
+    const setMessageAction = useSetAtom(messageActionAtom)
+    const methods = useForm({
+        defaultValues
+    })
+
+    useEffect(() => {
+        methods.reset(defaultValues)
+    }, [defaultValues])
+
+    const { call, error, loading } = useFrappePostCall('raven.api.message_actions.execute_action')
+
+    const onSubmit = (data: Record<string, any>) => {
+        call({
+            action_id: action.name,
+            message_id: messageID,
+            values: data
+        }).then(() => {
+            toast.success("Success", {
+                description: action.success_message
+            })
+
+            setMessageAction({ actionID: '', messageID: '' })
+        })
+    }
+
+    return <FormProvider {...methods}>
+        <form onSubmit={methods.handleSubmit(onSubmit)}>
+            <Stack gap='3'>
+                {error && <ErrorBanner error={error} />}
+                {action.fields?.map((field, index) => {
+                    return <FieldRenderer key={field.fieldname} field={field} autoFocus={index === 0} />
+                })}
+
+                <HStack justify='end'>
+                    <Dialog.Close>
+                        <Button color='gray' variant="soft" disabled={loading}>Cancel</Button>
+                    </Dialog.Close>
+                    <Button type="submit" disabled={loading}>
+                        {loading && <Loader />}
+                        Save
+                    </Button>
+                </HStack>
+            </Stack>
+        </form>
+    </FormProvider>
+
+}
+
+type DataFieldTypes = "number" | "search" | "time" | "text" | "hidden" | "tel" | "url" | "email" | "date" | "datetime-local" | "month" | "password" | "week"
+
+const FieldRenderer = ({ field, autoFocus }: { field: RavenMessageActionFields, autoFocus?: boolean }) => {
+
+    const { register, control, formState: { errors } } = useFormContext()
+
+    const hasError = !!errors[field.fieldname]
+
+    const requiredRule = field.is_required === 1 ? `${field.label} is required` : false
+
+    const ariaInvalid = hasError ? "true" : "false"
+    const ariaDescribedby = hasError ? `${field.fieldname}-error` : field.helper_text ? `${field.fieldname}-helper` : undefined
+
+    const FieldLabel = () => {
+        return <Label isRequired={field.is_required === 1} htmlFor={field.fieldname}>{field.label}</Label>
+    }
+
+    const FieldHelperText = () => {
+        if (!field.helper_text) return null
+        return <HelperText id={`${field.fieldname}-helper`}>{field.helper_text}</HelperText>
+    }
+
+    const FieldError = () => {
+        if (!errors[field.fieldname]) return null
+        return <ErrorText id={`${field.fieldname}-error`}>{errors[field.fieldname]?.message as string}</ErrorText>
+    }
+
+    const FieldComponent = () => {
+
+        if (field.type === "Small Text") {
+
+            return <Box>
+                <FieldLabel />
+                <TextArea
+                    {...register(field.fieldname, { required: requiredRule })}
+                    id={field.fieldname}
+                    aria-invalid={ariaInvalid}
+                    aria-required={field.is_required === 1}
+                    aria-describedby={ariaDescribedby}
+                    rows={5}
+                    autoFocus={autoFocus}
+                />
+            </Box>
+        }
+
+        if (field.type === "Select") {
+            return <Box>
+                <FieldLabel />
+                <Controller
+                    name={field.fieldname}
+                    rules={{
+                        required: requiredRule
+                    }}
+                    control={control}
+                    render={({ field: { value, onChange, onBlur, name, disabled, ref } }) => (
+                        <Select.Root value={value}
+                            name={name}
+                            required={field.is_required === 1}
+                            onValueChange={onChange}
+                        >
+                            <Select.Trigger
+                                onBlur={onBlur}
+                                className='w-full'
+                                id={field.fieldname}
+                                ref={ref}
+                                aria-invalid={ariaInvalid}
+                                aria-required={field.is_required === 1}
+                                aria-describedby={ariaDescribedby}
+                                disabled={disabled}
+                                autoFocus={autoFocus}
+                            />
+                            <Select.Content>
+                                {field.options?.split("\n").map(option => {
+                                    return <Select.Item key={option} value={option}>{option}</Select.Item>
+                                })}
+                            </Select.Content>
+                        </Select.Root>
+                    )}
+                />
+            </Box>
+        }
+
+        if (field.type === "Link") {
+            return <Box>
+                <LinkFormField
+                    name={field.fieldname}
+                    doctype={field.options ?? ""}
+                    label={field.label}
+                    required={field.is_required === 1}
+                    autofocus={autoFocus}
+                    aria-invalid={ariaInvalid}
+                    aria-describedby={ariaDescribedby}
+                    aria-required={field.is_required === 1}
+                />
+            </Box>
+        }
+
+        if (field.type === "Number") {
+            return <Box>
+                <FieldLabel />
+                <TextField.Root
+                    {...register(field.fieldname, { required: requiredRule, valueAsNumber: true })}
+                    id={field.fieldname}
+                    aria-invalid={ariaInvalid}
+                    aria-describedby={ariaDescribedby}
+                    aria-required={field.is_required === 1}
+                    type="number"
+                    autoFocus={autoFocus}
+                />
+            </Box>
+        }
+
+        if (field.type === "Checkbox") {
+            return <Text as="label" size="2">
+                <HStack>
+                    <Controller
+                        control={control}
+                        rules={{
+                            required: requiredRule
+                        }}
+                        name={field.fieldname}
+                        render={({ field: { value, onChange, onBlur, name, disabled, ref } }) => (
+                            <Checkbox
+                                checked={value ? true : false}
+                                disabled={disabled}
+                                name={name}
+                                aria-invalid={ariaInvalid}
+                                aria-describedby={ariaDescribedby}
+                                aria-required={field.is_required === 1}
+                                onBlur={onBlur}
+                                ref={ref}
+                                onCheckedChange={(v) => onChange(v ? 1 : 0)}
+                                autoFocus={autoFocus}
+                            />
+                        )} />
+
+                    {field.label}
+                </HStack>
+            </Text>
+        }
+
+        if (field.type === "Date") {
+            return <Box>
+                <FieldLabel />
+                <TextField.Root
+                    {...register(field.fieldname, { required: requiredRule })}
+                    aria-invalid={ariaInvalid}
+                    aria-describedby={ariaDescribedby}
+                    aria-required={field.is_required === 1}
+                    id={field.fieldname}
+                    type="date"
+                    autoFocus={autoFocus}
+                />
+            </Box>
+        }
+
+        if (field.type === "Time") {
+            return <Box>
+                <FieldLabel />
+                <TextField.Root
+                    {...register(field.fieldname, { required: requiredRule })}
+                    id={field.fieldname}
+                    aria-invalid={ariaInvalid}
+                    aria-describedby={ariaDescribedby}
+                    aria-required={field.is_required === 1}
+                    type="time"
+                    autoFocus={autoFocus}
+                />
+            </Box>
+        }
+
+        if (field.type === "Datetime") {
+            return <Box>
+                <FieldLabel />
+                <TextField.Root
+                    {...register(field.fieldname, { required: requiredRule })}
+                    id={field.fieldname}
+                    aria-invalid={ariaInvalid}
+                    aria-describedby={ariaDescribedby}
+                    aria-required={field.is_required === 1}
+                    type="datetime-local"
+                    autoFocus={autoFocus}
+                />
+            </Box>
+        }
+
+        return <Box>
+            <FieldLabel />
+            <TextField.Root
+                {...register(field.fieldname, { required: requiredRule })}
+                id={field.fieldname}
+                aria-invalid={ariaInvalid}
+                aria-describedby={ariaDescribedby}
+                aria-required={field.is_required === 1}
+                type={field.options ? field.options as DataFieldTypes : "text"}
+                autoFocus={autoFocus}
+            />
+        </Box>
+    }
+
+    return <Stack>
+        <FieldComponent />
+        <FieldError />
+        <FieldHelperText />
+    </Stack>
+
+}
\ No newline at end of file
diff --git a/frontend/src/components/feature/message-actions/MessageActionVariableBuilder.tsx b/frontend/src/components/feature/message-actions/MessageActionVariableBuilder.tsx
new file mode 100644
index 000000000..a1c582ae1
--- /dev/null
+++ b/frontend/src/components/feature/message-actions/MessageActionVariableBuilder.tsx
@@ -0,0 +1,487 @@
+import { HStack } from '@/components/layout/Stack'
+import { Stack } from '@/components/layout/Stack'
+import useDoctypeMeta from '@/hooks/useDoctypeMeta'
+import { RavenMessageAction } from '@/types/RavenIntegrations/RavenMessageAction'
+import { RavenMessageActionFields } from '@/types/RavenIntegrations/RavenMessageActionFields'
+import { Badge, BadgeProps, Box, Button, Checkbox, Code, Dialog, IconButton, Select, Table, Text, TextArea, TextField, Tooltip, VisuallyHidden } from '@radix-ui/themes'
+import { useState } from 'react'
+import { Controller, FormProvider, useForm, useFormContext } from 'react-hook-form'
+import { useFieldArray } from 'react-hook-form'
+import { BiTrashAlt } from 'react-icons/bi'
+import { FiEdit } from 'react-icons/fi'
+import { DoctypeFieldSelect } from '../settings/ai/functions/DoctypeVariableDialogForm'
+import { DocField } from '@/types/Core/DocField'
+import { ErrorText, HelperText, Label } from '@/components/common/Form'
+import LinkFormField from '@/components/common/LinkField/LinkFormField'
+import clsx from 'clsx'
+import { DIALOG_CONTENT_CLASS } from '@/utils/layout/dialog'
+
+type Props = {}
+
+const MessageActionVariableBuilder = (props: Props) => {
+    const { control, watch } = useFormContext<RavenMessageAction>()
+
+    const { fields, append, remove, update } = useFieldArray({
+        control,
+        name: 'fields'
+    })
+
+    const addField = (data: Partial<RavenMessageActionFields>) => {
+        // @ts-expect-error
+        append(data)
+    }
+
+    const onEdit = (index: number, data: Partial<RavenMessageActionFields>) => {
+        update(index, data as RavenMessageActionFields)
+    }
+
+    const action = watch('action')
+    const doctype = watch('document_type')
+    return <Stack>
+        <HStack justify='end' align='center'>
+            {action === "Create Document" && doctype &&
+                <ImportDoctypeVariables append={addField} />
+            }
+            <AddFieldDialog onAdd={addField} doctype={doctype} />
+        </HStack>
+
+        <Stack>
+            <Table.Root variant='surface' className='rounded-sm'>
+                <Table.Header>
+                    <Table.Row>
+                        <Table.ColumnHeaderCell>Label</Table.ColumnHeaderCell>
+                        <Table.ColumnHeaderCell>Fieldname</Table.ColumnHeaderCell>
+                        <Table.ColumnHeaderCell>Required</Table.ColumnHeaderCell>
+                        <Table.ColumnHeaderCell>Options</Table.ColumnHeaderCell>
+                        <Table.ColumnHeaderCell>Default Value</Table.ColumnHeaderCell>
+                        <Table.ColumnHeaderCell></Table.ColumnHeaderCell>
+                    </Table.Row>
+                </Table.Header>
+                <Table.Body>
+                    {fields.map((field, index) => {
+                        return <Table.Row key={field.id}>
+                            <Table.Cell><Text as='span' size='2' weight='medium'>{field.label}</Text> <Badge color={getColorForFieldType(field.type)} className='ml-2 rounded-md'>{field.type}</Badge></Table.Cell>
+                            <Table.Cell><Code variant='ghost'>{field.fieldname}</Code></Table.Cell>
+                            <Table.Cell><Checkbox checked={!!field.is_required} /></Table.Cell>
+                            <Table.Cell>
+                                {field.options ? field.type === 'Select' ?
+                                    <Tooltip content={field.options.split('\n').join(', ')}>
+                                        <Badge color='blue' className='rounded-md'>{field.options.split('\n').length} Options</Badge>
+                                    </Tooltip>
+                                    : <Badge color='iris' variant='soft' className='rounded-md'>{field.options}</Badge> : null}
+                            </Table.Cell>
+                            <Table.Cell>{field.default_value}</Table.Cell>
+                            <Table.Cell>
+                                <HStack align='center' pr='2' gap='4'>
+                                    <EditFieldDialog onEdit={(data) => onEdit(index, data)} field={field} doctype={doctype} />
+                                    <IconButton
+                                        size='2'
+                                        color='red'
+                                        variant='ghost'
+                                        type='button'
+                                        onClick={() => remove(index)}>
+                                        <BiTrashAlt size='16' />
+                                    </IconButton>
+                                </HStack>
+                            </Table.Cell>
+                        </Table.Row>
+                    })}
+                </Table.Body>
+            </Table.Root>
+        </Stack>
+    </Stack>
+}
+
+export default MessageActionVariableBuilder
+
+export const getColorForFieldType = (type: RavenMessageActionFields['type']): BadgeProps['color'] => {
+    switch (type) {
+        case 'Select': return 'blue'
+        case 'Number': return 'purple'
+        case 'Date': return 'violet'
+        case 'Datetime': return 'violet'
+        case 'Time': return 'violet'
+        case 'Data': return 'green'
+        case 'Checkbox': return 'pink'
+        case 'Small Text': return 'orange'
+        case 'Link': return 'sky'
+        default: return 'gray'
+    }
+}
+
+const getType = (fieldtype: DocField['fieldtype']): RavenMessageActionFields['type'] => {
+    switch (fieldtype) {
+        case 'Select': return 'Select'
+        case 'Autocomplete': return 'Link'
+        case 'Link': return 'Link'
+        case 'Int': return 'Number'
+        case 'Currency': return 'Number'
+        case 'Float': return 'Number'
+        case 'Date': return 'Date'
+        case 'Datetime': return 'Datetime'
+        case 'Time': return 'Time'
+        case 'Data': return 'Data'
+        case 'Small Text': return 'Small Text'
+        case 'Long Text': return 'Small Text'
+        case 'Check': return 'Checkbox'
+        default: return 'Small Text'
+    }
+}
+
+const getOptionForData = (option?: string) => {
+    if (!option) return ''
+
+    if (option === "Email") return "email"
+    if (option === "Phone") return "tel"
+    if (option === "URL") return "url"
+
+    return ''
+}
+
+const ImportDoctypeVariables = ({ append }: { append: (data: Partial<RavenMessageActionFields>) => void }) => {
+
+    const { watch, getValues } = useFormContext<RavenMessageAction>()
+
+    const doctype = watch('document_type')
+
+    const { doc: doctypeMeta, childDocs } = useDoctypeMeta(doctype ?? '')
+
+    const importFields = () => {
+
+        // Get the existing fields 
+        const existingFields = (getValues('fields') || []).map(f => f.fieldname)
+
+        // Get all the required fields from the doctypes
+        const requiredFields = doctypeMeta?.fields?.filter(f => f.reqd && f.fieldtype !== 'Table' && f.fieldtype !== 'Table MultiSelect')
+
+        // Filter out the fields that already exist
+        const fieldsToBeAdded = requiredFields?.filter(f => !existingFields.includes(f.fieldname ?? ''))
+
+        // Add the fields to the form
+        fieldsToBeAdded?.forEach((field) => {
+            append({
+                fieldname: field.fieldname,
+                label: field.label,
+                helper_text: field.description,
+                type: getType(field.fieldtype),
+                is_required: field.reqd,
+                options: field.fieldtype === 'Data' ? getOptionForData(field.options) : field.options,
+                default_value_type: 'Static',
+                default_value: field.default
+            })
+        })
+    }
+
+    return <Button variant='outline' type='button' className='not-cal' onClick={importFields}>Import fields from {doctype}</Button>
+}
+
+const AddFieldDialog = ({ onAdd, doctype }: { onAdd: (data: Partial<RavenMessageActionFields>) => void, doctype?: string }) => {
+
+    const [open, setOpen] = useState(false)
+
+    const onAddField = (data: Partial<RavenMessageActionFields>) => {
+        onAdd(data)
+        setOpen(false)
+    }
+
+
+    return <Dialog.Root open={open} onOpenChange={setOpen}>
+        <Dialog.Trigger>
+            <Button type='button' className='not-cal'>Add</Button>
+        </Dialog.Trigger>
+        <Dialog.Content className={clsx(DIALOG_CONTENT_CLASS, 'static')}>
+            <Dialog.Title>Add Field</Dialog.Title>
+            <VisuallyHidden>
+                <Dialog.Description>Add a new field for this action.</Dialog.Description>
+            </VisuallyHidden>
+            <FieldForm doctype={doctype} onAdd={onAddField} />
+        </Dialog.Content>
+    </Dialog.Root>
+}
+
+const EditFieldDialog = ({ onEdit, field, doctype }: { onEdit: (data: Partial<RavenMessageActionFields>) => void, field: RavenMessageActionFields, doctype?: string }) => {
+
+    const [open, setOpen] = useState(false)
+
+    const onEditField = (data: Partial<RavenMessageActionFields>) => {
+        onEdit(data)
+        setOpen(false)
+    }
+
+    return <Dialog.Root open={open} onOpenChange={setOpen}>
+        <Dialog.Trigger>
+            <IconButton
+                size='2'
+                color='gray'
+                variant='ghost'
+                type='button'
+            >
+                <FiEdit size='16' className='text-gray-10' />
+            </IconButton>
+        </Dialog.Trigger>
+        <Dialog.Content className={clsx(DIALOG_CONTENT_CLASS, 'static')}>
+            <Dialog.Title>Edit Field</Dialog.Title>
+            <VisuallyHidden>
+                <Dialog.Description>Edit field - {field.fieldname} for this action.</Dialog.Description>
+            </VisuallyHidden>
+            <FieldForm doctype={doctype} field={field} onAdd={onEditField} />
+        </Dialog.Content>
+    </Dialog.Root>
+}
+
+const FieldForm = ({ doctype, field, onAdd }: { doctype?: string, field?: RavenMessageActionFields, onAdd: (data: Partial<RavenMessageActionFields>) => void }) => {
+
+    const methods = useForm<RavenMessageActionFields>({
+        defaultValues: field
+    })
+
+    const { register, watch, setValue, formState: { errors }, control } = methods
+
+    const fieldname = watch('fieldname')
+    const type = watch('type')
+    const default_value_type = watch('default_value_type')
+
+    const onSubmit = (data: Partial<RavenMessageActionFields>) => {
+        onAdd(data)
+    }
+
+    const onFieldSelect = (field: DocField) => {
+        setValue('fieldname', field.fieldname ?? '')
+
+        // Based on the fieldtype, set the type and options (if any)
+        if (field.label) {
+            setValue('label', field.label)
+        }
+
+        if (field.description) {
+            setValue('helper_text', field.description)
+        }
+
+        if (field.fieldtype) {
+            setValue('type', getType(field.fieldtype))
+        }
+
+        if (field.options) {
+            if (field.fieldtype === 'Data') {
+                setValue('options', getOptionForData(field.options))
+            } else if (field.fieldtype === 'Autocomplete' || field.fieldtype === 'Link') {
+                setValue('options', field.options)
+            } else if (field.fieldtype === 'Select') {
+                setValue('options', field.options)
+            }
+        }
+
+    }
+
+    const onFieldTypeChange = (type: string) => {
+        if (type === "Link") {
+            setValue('options', '')
+        }
+    }
+
+    return <FormProvider {...methods}>
+        <Stack gap='4'>
+            <Stack gap='4'>
+                <HStack>
+                    {doctype ? <DoctypeFieldSelect
+                        doctype={doctype}
+                        value={fieldname}
+                        onFieldSelect={onFieldSelect}
+                    /> : <Stack>
+                        <Box>
+                            <Label isRequired htmlFor='fieldname'>Field Name</Label>
+                            <TextField.Root {...register('fieldname', {
+                                required: 'Field is required'
+                            })} id='fieldname' />
+                        </Box>
+                        {errors.fieldname && <ErrorText>{errors.fieldname.message}</ErrorText>}
+                    </Stack>
+                    }
+
+                    <Stack width={'50%'}>
+                        <Box>
+                            <Label isRequired htmlFor='label'>Label</Label>
+                            <TextField.Root {...register('label', {
+                                required: 'Label is required'
+                            })} id='label' />
+                        </Box>
+                        {errors.label && <ErrorText>{errors.label.message}</ErrorText>}
+                    </Stack>
+                </HStack>
+
+                <HStack>
+                    <Stack width={'50%'}>
+                        <Box>
+                            <Label isRequired>Type</Label>
+                            <Controller
+                                control={control}
+                                name='type'
+                                rules={{ required: "Type is required", onChange: onFieldTypeChange }}
+                                render={({ field: { value, onChange } }) => (
+                                    <Select.Root required value={value} onValueChange={(value) => onChange(value)}>
+                                        <Select.Trigger placeholder='Select a type' className='w-full' />
+                                        <Select.Content>
+                                            <Select.Item value='Data'>Data</Select.Item>
+                                            <Select.Item value='Number'>Number</Select.Item>
+                                            <Select.Item value='Select'>Select</Select.Item>
+                                            <Select.Item value='Link'>Link</Select.Item>
+                                            <Select.Item value='Checkbox'>Checkbox</Select.Item>
+                                            <Select.Item value='Date'>Date</Select.Item>
+                                            <Select.Item value='Time'>Time</Select.Item>
+                                            <Select.Item value='Datetime'>Datetime</Select.Item>
+                                            <Select.Item value='Small Text'>Small Text</Select.Item>
+                                        </Select.Content>
+                                    </Select.Root>
+                                )}
+                            />
+                        </Box>
+                        {errors.type && <ErrorText>{errors.type?.message}</ErrorText>}
+                    </Stack>
+
+                    {type === "Data" && <Stack width={'50%'}>
+                        <Box>
+                            <Label htmlFor='options'>Validation <Text as='span' weight='regular' size='2' color='gray'> (optional)</Text></Label>
+                            <TextField.Root {...register('options', {
+                                required: false,
+                                pattern: {
+                                    value: /^("email"|"tel"|"url")$/,
+                                    message: 'Invalid validation'
+                                }
+                            })} id='options' placeholder='"email", "tel", or "url"' />
+                        </Box>
+                        {errors.options && <ErrorText>{errors.options.message}</ErrorText>}
+                    </Stack>}
+                </HStack>
+
+                <Box>
+                    <Controller
+                        control={control}
+                        name='is_required'
+                        render={({ field }) => (
+                            <Text as="label" size="2">
+                                <HStack>
+                                    <Checkbox
+                                        checked={field.value ? true : false}
+                                        onCheckedChange={(v) => field.onChange(v ? 1 : 0)}
+                                    />
+                                    Required
+                                </HStack>
+                            </Text>
+                        )}
+                    />
+                </Box>
+
+                {type === 'Select' && <Stack>
+                    <Box>
+                        <Label>Options</Label>
+                        <TextArea
+                            {...register('options', {
+                                required: type === "Select" ? "Options are required" : false
+                            })}
+                            placeholder='Add options in new lines'
+                            rows={8}
+                        />
+                    </Box>
+                    {errors.options && <ErrorText>{errors.options?.message}</ErrorText>}
+                </Stack>}
+
+                {type === "Link" && <Stack>
+                    <LinkFormField
+                        name='options'
+                        doctype='DocType'
+                        label='Document Type'
+                        filters={[['istable', '=', 0], ['issingle', '=', 0]]}
+                        required
+                        rules={{
+                            required: type === "Link" ? 'Document Type is required' : false
+                        }}
+                    />
+                    {errors.options && <ErrorText>{errors.options?.message}</ErrorText>}
+                </Stack>}
+
+
+
+
+                <Stack>
+                    <Box>
+                        <Label htmlFor='default_value_type'>Default Value Type</Label>
+                        <Controller
+                            control={control}
+                            name='default_value_type'
+                            render={({ field: { value, onChange } }) => (
+                                <Select.Root value={value} onValueChange={onChange}>
+                                    <Select.Trigger placeholder='Select a default value type' className='w-full' id='default_value_type' />
+                                    <Select.Content>
+                                        <Select.Item value='Static'>Static</Select.Item>
+                                        <Select.Item value='Message Field'>Message Field</Select.Item>
+                                        <Select.Item value='Jinja'>Jinja</Select.Item>
+                                    </Select.Content>
+                                </Select.Root>
+                            )}
+                        />
+                    </Box>
+                    <HelperText>You can choose between a static default value, message field or jinja template.<br />
+                        Message field will allow you to set a default value from the message selected.
+                        <br />Jinja tags can be used with the message as context.</HelperText>
+                    {errors.default_value_type && <ErrorText>{errors.default_value_type.message}</ErrorText>}
+                </Stack>
+
+                <Stack>
+                    <Box>
+                        <Label htmlFor='default_value'>Default Value</Label>
+                        {default_value_type === "Static" &&
+                            <TextField.Root {...register('default_value')} id='default_value' />
+                        }
+
+                        {default_value_type === "Message Field" &&
+                            <Controller
+                                control={control}
+                                name='default_value'
+                                render={({ field: { value, onChange } }) => (
+                                    <Select.Root value={value} onValueChange={onChange}>
+                                        <Select.Trigger placeholder='Select a message field' className='w-full' id='default_value' />
+                                        <Select.Content>
+                                            <Select.Item value='text'>Text (with HTML tags)</Select.Item>
+                                            <Select.Item value='file'>File</Select.Item>
+                                            <Select.Item value='content'>Content (Text content without HTML tags)</Select.Item>
+                                            <Select.Item value='owner'>Owner (User)</Select.Item>
+                                            <Select.Item value='creation'>Creation (Datetime)</Select.Item>
+                                            <Select.Item value='message_type'>Message Type</Select.Item>
+                                            <Select.Item value='link_doctype'>Linked DocType</Select.Item>
+                                            <Select.Item value='link_document'>Link Document</Select.Item>
+                                        </Select.Content>
+                                    </Select.Root>
+
+                                )}
+                            />
+                        }
+
+                        {default_value_type === "Jinja" &&
+                            <TextArea {...register('default_value')}
+                                placeholder="This is the message: {{ message.content }}"
+                                id='default_value'
+                                rows={8} />
+                        }
+                    </Box>
+                    {errors.default_value && <ErrorText>{errors.default_value.message}</ErrorText>}
+                </Stack>
+
+                <Stack>
+                    <Box>
+                        <Label htmlFor='helper_text'>Description <Text as='span' weight='regular' size='2' color='gray'> (optional)</Text></Label>
+                        <TextField.Root {...register('helper_text')} id='helper_text' />
+                    </Box>
+                    {errors.helper_text && <ErrorText>{errors.helper_text.message}</ErrorText>}
+                </Stack>
+
+            </Stack>
+            <HStack justify='end'>
+                <Dialog.Close>
+                    <Button variant='soft' color='gray'>Close</Button>
+                </Dialog.Close>
+                <Button type='button' onClick={methods.handleSubmit(onSubmit)}>Add</Button>
+            </HStack>
+        </Stack>
+
+    </FormProvider>
+}
\ No newline at end of file
diff --git a/frontend/src/components/feature/settings/ai/bots/BotForm.tsx b/frontend/src/components/feature/settings/ai/bots/BotForm.tsx
index a227891e8..529efff63 100644
--- a/frontend/src/components/feature/settings/ai/bots/BotForm.tsx
+++ b/frontend/src/components/feature/settings/ai/bots/BotForm.tsx
@@ -9,8 +9,6 @@ import { useFormContext } from 'react-hook-form'
 import { RavenBot } from '@/types/RavenBot/RavenBot'
 import BotDocs from './BotDocs'
 
-type Props = {}
-
 const ICON_PROPS = {
     size: 18,
     className: 'mr-1.5'
diff --git a/frontend/src/components/feature/settings/ai/functions/DoctypeVariableDialogForm.tsx b/frontend/src/components/feature/settings/ai/functions/DoctypeVariableDialogForm.tsx
index 29d18bd5f..cb62203cd 100644
--- a/frontend/src/components/feature/settings/ai/functions/DoctypeVariableDialogForm.tsx
+++ b/frontend/src/components/feature/settings/ai/functions/DoctypeVariableDialogForm.tsx
@@ -228,7 +228,7 @@ const FieldSelectionField = ({ doctype }: { doctype: string }) => {
 /**
  * Component to render a select field for the fields of a doctype. Could be the main doctype or a child table.
  */
-const DoctypeFieldSelect = ({ doctype, value, onFieldSelect }: { doctype: string, value: string, onFieldSelect: (field: DocField) => void }) => {
+export const DoctypeFieldSelect = ({ doctype, value, onFieldSelect }: { doctype: string, value: string, onFieldSelect: (field: DocField) => void }) => {
 
     const { doc: doctypeMeta } = useDoctypeMeta(doctype)
 
@@ -236,7 +236,7 @@ const DoctypeFieldSelect = ({ doctype, value, onFieldSelect }: { doctype: string
 
         if (!doctypeMeta) return []
 
-        return doctypeMeta.fields?.filter((field) => in_list(VALID_FIELD_TYPES, field.fieldtype))
+        return doctypeMeta.fields?.filter((field) => in_list(VALID_FIELD_TYPES, field.fieldtype) && !field.read_only)
 
     }, [doctypeMeta])
 
diff --git a/frontend/src/components/feature/userSettings/SettingsSidebar.tsx b/frontend/src/components/feature/userSettings/SettingsSidebar.tsx
index d0914d35c..ca12e667d 100644
--- a/frontend/src/components/feature/userSettings/SettingsSidebar.tsx
+++ b/frontend/src/components/feature/userSettings/SettingsSidebar.tsx
@@ -27,6 +27,7 @@ export const SettingsSidebar = () => {
                     {/* <SettingsSidebarItem title="ERPNext" to='erpnext' /> */}
                     <SettingsSidebarItem title="HR" to='hr' />
                     {/* <SettingsSidebarItem title='Notifications' to='notifications' /> */}
+                    <SettingsSidebarItem title="Message Actions" to='message-actions' />
                     <SettingsSidebarItem title="Scheduled Messages" to='scheduled-messages' />
                     <SettingsSidebarItem title="Webhooks" to='webhooks' />
                     {/* <SettingsSidebarItem title="Frappe LMS" to='frappe-lms' /> */}
diff --git a/frontend/src/pages/MainPage.tsx b/frontend/src/pages/MainPage.tsx
index e4855f146..2a88ebdff 100644
--- a/frontend/src/pages/MainPage.tsx
+++ b/frontend/src/pages/MainPage.tsx
@@ -10,6 +10,7 @@ import CommandMenu from '@/components/feature/CommandMenu/CommandMenu'
 import { useFetchActiveUsersRealtime } from '@/hooks/fetchers/useFetchActiveUsers'
 import { useIsMobile } from '@/hooks/useMediaQuery'
 import { showNotification } from '@/utils/pushNotifications'
+import MessageActionController from '@/components/feature/message-actions/MessageActionController'
 
 const AddRavenUsersPage = lazy(() => import('@/pages/AddRavenUsersPage'))
 
@@ -57,6 +58,7 @@ const MainPageContent = () => {
                 </Box>
             </Flex>
             <CommandMenu />
+            <MessageActionController />
         </ChannelListProvider>
     </UserListProvider>
 }
\ No newline at end of file
diff --git a/frontend/src/pages/settings/MessageActions/CreateMessageAction.tsx b/frontend/src/pages/settings/MessageActions/CreateMessageAction.tsx
new file mode 100644
index 000000000..f18c68f54
--- /dev/null
+++ b/frontend/src/pages/settings/MessageActions/CreateMessageAction.tsx
@@ -0,0 +1,57 @@
+import { Loader } from '@/components/common/Loader'
+import MessageActionForm from '@/components/feature/message-actions/MessageActionForm'
+import { ErrorBanner } from '@/components/layout/AlertBanner'
+import PageContainer from '@/components/layout/Settings/PageContainer'
+import SettingsContentContainer from '@/components/layout/Settings/SettingsContentContainer'
+import SettingsPageHeader from '@/components/layout/Settings/SettingsPageHeader'
+import { RavenMessageAction } from '@/types/RavenIntegrations/RavenMessageAction'
+import { Button } from '@radix-ui/themes'
+import { useFrappeCreateDoc } from 'frappe-react-sdk'
+import { FormProvider, useForm } from 'react-hook-form'
+import { useNavigate } from 'react-router-dom'
+
+const CreateMessageAction = () => {
+
+    const { createDoc, loading, error } = useFrappeCreateDoc<RavenMessageAction>()
+
+    const methods = useForm<RavenMessageAction>({
+        disabled: loading,
+        defaultValues: {
+            enabled: 1,
+            action: 'Create Document'
+        }
+    })
+
+    const navigate = useNavigate()
+
+
+    const onSubmit = (data: RavenMessageAction) => {
+        createDoc("Raven Message Action", data)
+            .then((doc) => {
+                navigate(`../${doc.name}`)
+            })
+    }
+
+    return (
+        <PageContainer>
+            <form onSubmit={methods.handleSubmit(onSubmit)}>
+                <FormProvider {...methods}>
+                    <SettingsContentContainer>
+                        <SettingsPageHeader
+                            title='Create a Message Action'
+                            actions={<Button type='submit' disabled={loading}>
+                                {loading && <Loader />}
+                                {loading ? "Creating" : "Create"}
+                            </Button>}
+                            breadcrumbs={[{ label: 'Message Action', href: '../' }, { label: 'New Message Action', href: '' }]}
+                        />
+                        <ErrorBanner error={error} />
+                        <MessageActionForm />
+                    </SettingsContentContainer>
+                </FormProvider>
+            </form>
+        </PageContainer>
+    )
+}
+
+export const Component = CreateMessageAction
\ No newline at end of file
diff --git a/frontend/src/pages/settings/MessageActions/MessageActionList.tsx b/frontend/src/pages/settings/MessageActions/MessageActionList.tsx
new file mode 100644
index 000000000..b7583a83e
--- /dev/null
+++ b/frontend/src/pages/settings/MessageActions/MessageActionList.tsx
@@ -0,0 +1,71 @@
+import { ErrorBanner } from '@/components/layout/AlertBanner'
+import { TableLoader } from '@/components/layout/Loaders/TableLoader'
+import PageContainer from '@/components/layout/Settings/PageContainer'
+import SettingsContentContainer from '@/components/layout/Settings/SettingsContentContainer'
+import SettingsPageHeader from '@/components/layout/Settings/SettingsPageHeader'
+import { HStack } from '@/components/layout/Stack'
+import { RavenMessageAction } from '@/types/RavenIntegrations/RavenMessageAction'
+import { Badge, Button, Table } from '@radix-ui/themes'
+import { useFrappeGetDocList } from 'frappe-react-sdk'
+import { Link } from 'react-router-dom'
+
+const MessageActionList = () => {
+
+    const { data, isLoading, error } = useFrappeGetDocList<RavenMessageAction>("Raven Message Action", {
+        fields: ["name", "enabled", "action_name", "action"],
+        orderBy: {
+            field: "modified",
+            order: "desc"
+        }
+    })
+    return (
+        <PageContainer>
+            <SettingsContentContainer>
+                <SettingsPageHeader
+                    title='Message Actions'
+                    description='Use these to add custom actions - like creating an issue/task from a message.'
+                    actions={<Button asChild>
+                        <Link to='create'>Create</Link>
+                    </Button>}
+                />
+                {isLoading && <TableLoader columns={2} />}
+                <ErrorBanner error={error} />
+                {data && <MessageActionsTable actions={data} />}
+            </SettingsContentContainer>
+        </PageContainer>
+    )
+}
+
+const MessageActionsTable = ({ actions }: { actions: RavenMessageAction[] }) => {
+    return (
+        <Table.Root variant="surface" className='rounded-sm'>
+            <Table.Header>
+                <Table.Row>
+                    <Table.ColumnHeaderCell>Name</Table.ColumnHeaderCell>
+                    <Table.ColumnHeaderCell>Type</Table.ColumnHeaderCell>
+                </Table.Row>
+            </Table.Header>
+            <Table.Body>
+                {actions?.map((action) => (
+                    <Table.Row key={action.name}>
+                        <Table.Cell maxWidth={"150px"}>
+                            <HStack align='center'>
+                                <Link to={`${action.name}`} className='hover:underline underline-offset-4 font-medium'>
+                                    {action.action_name}
+                                </Link>
+
+                                {!action.enabled && <Badge color='gray' size='2'>Disabled</Badge>}
+                            </HStack>
+                        </Table.Cell>
+                        <Table.Cell maxWidth={"250px"}>
+                            <Badge color={
+                                action.action === "Create Document" ? "blue" : "purple"
+                            } size='2'>{action.action}</Badge>
+                        </Table.Cell>
+                    </Table.Row>
+                ))}
+            </Table.Body>
+        </Table.Root>
+    )
+}
+export const Component = MessageActionList
\ No newline at end of file
diff --git a/frontend/src/pages/settings/MessageActions/ViewMessageAction.tsx b/frontend/src/pages/settings/MessageActions/ViewMessageAction.tsx
new file mode 100644
index 000000000..58d23aef3
--- /dev/null
+++ b/frontend/src/pages/settings/MessageActions/ViewMessageAction.tsx
@@ -0,0 +1,81 @@
+import { Loader } from "@/components/common/Loader"
+import MessageActionForm from "@/components/feature/message-actions/MessageActionForm"
+import { ErrorBanner } from "@/components/layout/AlertBanner"
+import { FullPageLoader } from "@/components/layout/Loaders"
+import PageContainer from "@/components/layout/Settings/PageContainer"
+import SettingsContentContainer from "@/components/layout/Settings/SettingsContentContainer"
+import SettingsPageHeader from "@/components/layout/Settings/SettingsPageHeader"
+import { HStack } from "@/components/layout/Stack"
+import { RavenMessageAction } from "@/types/RavenIntegrations/RavenMessageAction"
+import { isEmpty } from "@/utils/validations"
+import { Button } from "@radix-ui/themes"
+import { useFrappeGetDoc, useFrappeUpdateDoc, SWRResponse } from "frappe-react-sdk"
+import { FormProvider, useForm } from "react-hook-form"
+import { useParams } from "react-router-dom"
+import { toast } from "sonner"
+
+type Props = {}
+
+const ViewMessageAction = (props: Props) => {
+
+    const { ID } = useParams<{ ID: string }>()
+
+    const { data, isLoading, error, mutate } = useFrappeGetDoc<RavenMessageAction>("Raven Message Action", ID)
+
+    return (
+        <PageContainer>
+            <ErrorBanner error={error} />
+            {isLoading && <FullPageLoader className="h-64" />}
+            {data && <ViewMessageActionContent data={data} mutate={mutate} />}
+        </PageContainer>
+    )
+}
+
+const ViewMessageActionContent = ({ data, mutate }: { data: RavenMessageAction, mutate: SWRResponse['mutate'] }) => {
+
+    const { updateDoc, loading, error } = useFrappeUpdateDoc<RavenMessageAction>()
+
+    const methods = useForm<RavenMessageAction>({
+        disabled: loading,
+        defaultValues: data
+    })
+
+    const { formState: { dirtyFields } } = methods
+
+    const isDirty = !isEmpty(dirtyFields)
+
+
+    const onSubmit = (data: RavenMessageAction) => {
+        updateDoc("Raven Message Action", data.name, data)
+            .then((doc) => {
+                toast.success("Saved")
+                methods.reset(doc)
+                mutate(doc, { revalidate: false })
+            })
+    }
+
+
+
+    return <form onSubmit={methods.handleSubmit(onSubmit)}>
+        <FormProvider {...methods}>
+            <SettingsContentContainer>
+                <SettingsPageHeader
+                    title={data.action_name}
+                    headerBadges={isDirty ? [{ label: "Not Saved", color: "red" }] : undefined}
+                    actions={<HStack>
+                        <Button type='submit' disabled={loading}>
+                            {loading && <Loader />}
+                            {loading ? "Saving" : "Save"}
+                        </Button>
+                    </HStack>}
+                    breadcrumbs={[{ label: 'Message Actions', href: '../' }, { label: data.action_name, href: '', copyToClipboard: true }]}
+                />
+                <ErrorBanner error={error} />
+                <MessageActionForm />
+            </SettingsContentContainer>
+        </FormProvider>
+    </form>
+
+}
+
+export const Component = ViewMessageAction
\ No newline at end of file
diff --git a/frontend/src/types/RavenIntegrations/RavenMessageAction.ts b/frontend/src/types/RavenIntegrations/RavenMessageAction.ts
new file mode 100644
index 000000000..aa6e21beb
--- /dev/null
+++ b/frontend/src/types/RavenIntegrations/RavenMessageAction.ts
@@ -0,0 +1,32 @@
+import { RavenMessageActionFields } from './RavenMessageActionFields'
+
+export interface RavenMessageAction{
+	creation: string
+	name: string
+	modified: string
+	owner: string
+	modified_by: string
+	docstatus: 0 | 1 | 2
+	parent?: string
+	parentfield?: string
+	parenttype?: string
+	idx?: number
+	/**	Action Name : Data	*/
+	action_name: string
+	/**	Enabled : Check	*/
+	enabled?: 0 | 1
+	/**	Action : Select	*/
+	action: "Create Document" | "Custom Function"
+	/**	Document Type : Link - DocType	*/
+	document_type?: string
+	/**	Custom Function Path : Small Text	*/
+	custom_function_path?: string
+	/**	Title : Data - Shown on the dialog	*/
+	title: string
+	/**	Description : Small Text	*/
+	description?: string
+	/**	Success Message : Small Text	*/
+	success_message?: string
+	/**	Fields : Table - Raven Message Action Fields	*/
+	fields?: RavenMessageActionFields[]
+}
\ No newline at end of file
diff --git a/frontend/src/types/RavenIntegrations/RavenMessageActionFields.ts b/frontend/src/types/RavenIntegrations/RavenMessageActionFields.ts
new file mode 100644
index 000000000..3563dacc7
--- /dev/null
+++ b/frontend/src/types/RavenIntegrations/RavenMessageActionFields.ts
@@ -0,0 +1,29 @@
+
+export interface RavenMessageActionFields{
+	creation: string
+	name: string
+	modified: string
+	owner: string
+	modified_by: string
+	docstatus: 0 | 1 | 2
+	parent?: string
+	parentfield?: string
+	parenttype?: string
+	idx?: number
+	/**	Fieldname : Data	*/
+	fieldname: string
+	/**	Label : Data	*/
+	label: string
+	/**	Helper Text : Data	*/
+	helper_text?: string
+	/**	Is Required? : Check	*/
+	is_required?: 0 | 1
+	/**	Type : Select	*/
+	type: "Data" | "Number" | "Select" | "Link" | "Date" | "Time" | "Datetime" | "Small Text" | "Checkbox"
+	/**	Options : Small Text	*/
+	options?: string
+	/**	Default Value Type : Select	*/
+	default_value_type?: "Static" | "Message Field" | "Jinja"
+	/**	Default Value : Small Text	*/
+	default_value?: string
+}
\ No newline at end of file
diff --git a/raven/api/message_actions.py b/raven/api/message_actions.py
new file mode 100644
index 000000000..2ab3382d8
--- /dev/null
+++ b/raven/api/message_actions.py
@@ -0,0 +1,69 @@
+import frappe
+from frappe import _
+
+
+@frappe.whitelist(methods=["GET"])
+def get_action_defaults(action_id: str, message_id: str):
+	"""
+	Get the default values for a message action
+	"""
+
+	frappe.has_permission(doctype="Raven Message", doc=message_id, ptype="read", throw=True)
+	action = frappe.get_doc("Raven Message Action", action_id)
+	message = frappe.get_doc("Raven Message", message_id)
+
+	# Loop through the fields in the action and get the default values from the message
+	defaults = {}
+
+	for field in action.fields:
+		if not field.default_value:
+			continue
+
+		if field.default_value_type == "Static":
+			defaults[field.fieldname] = field.default_value
+
+		if field.default_value_type == "Message Field":
+			val = message.get(field.default_value)
+			if val:
+				defaults[field.fieldname] = val
+
+		if field.default_value_type == "Jinja":
+			val = frappe.render_template(field.default_value, {"message": message})
+
+			if val:
+				defaults[field.fieldname] = val
+
+	return defaults
+
+
+@frappe.whitelist(methods=["POST"])
+def execute_action(action_id: str, message_id: str, values: dict):
+	"""
+	Execute a message action
+	"""
+
+	frappe.has_permission(doctype="Raven Message", doc=message_id, ptype="read", throw=True)
+	action = frappe.get_doc("Raven Message Action", action_id)
+	message = frappe.get_doc("Raven Message", message_id)
+
+	if action.action == "Create Document":
+		doc = frappe.get_doc({"doctype": action.document_type, **values})
+		doc.insert()
+
+		# Link message to the document if no link exists already
+		if not message.link_doctype and not message.link_document:
+			message.flags.editing_metadata = True
+			message.link_doctype = doc.doctype
+			message.link_document = doc.name
+			message.save()
+
+		return {"message": "Document created successfully", "document": doc.name, "doctype": doc.doctype}
+
+	if action.action == "Custom Function":
+		# Call the function with the values
+		function_name = frappe.get_attr(action.custom_function_path)
+
+		if function_name:
+			return function_name(**values)
+		else:
+			frappe.throw(_("Function {0} not found").format(action.custom_function_path))
diff --git a/raven/raven_integrations/doctype/raven_message_action/__init__.py b/raven/raven_integrations/doctype/raven_message_action/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/raven/raven_integrations/doctype/raven_message_action/raven_message_action.js b/raven/raven_integrations/doctype/raven_message_action/raven_message_action.js
new file mode 100644
index 000000000..e301b2210
--- /dev/null
+++ b/raven/raven_integrations/doctype/raven_message_action/raven_message_action.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2024, The Commit Company (Algocode Technologies Pvt. Ltd.) and contributors
+// For license information, please see license.txt
+
+// frappe.ui.form.on("Raven Message Action", {
+// 	refresh(frm) {
+
+// 	},
+// });
diff --git a/raven/raven_integrations/doctype/raven_message_action/raven_message_action.json b/raven/raven_integrations/doctype/raven_message_action/raven_message_action.json
new file mode 100644
index 000000000..5417ba7c7
--- /dev/null
+++ b/raven/raven_integrations/doctype/raven_message_action/raven_message_action.json
@@ -0,0 +1,124 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "autoname": "hash",
+ "creation": "2024-10-16 11:06:04.587296",
+ "doctype": "DocType",
+ "engine": "InnoDB",
+ "field_order": [
+  "action_name",
+  "enabled",
+  "column_break_tbnt",
+  "action",
+  "document_type",
+  "custom_function_path",
+  "dialog_properties_tab",
+  "title",
+  "description",
+  "success_message",
+  "fields_tab",
+  "fields"
+ ],
+ "fields": [
+  {
+   "description": "Shown on the dialog",
+   "fieldname": "title",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Title",
+   "reqd": 1
+  },
+  {
+   "fieldname": "description",
+   "fieldtype": "Small Text",
+   "label": "Description"
+  },
+  {
+   "fieldname": "column_break_tbnt",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "action",
+   "fieldtype": "Select",
+   "label": "Action",
+   "options": "Create Document\nCustom Function",
+   "reqd": 1
+  },
+  {
+   "depends_on": "eval: doc.action == \"Create Document\";",
+   "fieldname": "document_type",
+   "fieldtype": "Link",
+   "label": "Document Type",
+   "mandatory_depends_on": "eval: doc.action == \"Create Document\";",
+   "options": "DocType"
+  },
+  {
+   "fieldname": "success_message",
+   "fieldtype": "Small Text",
+   "label": "Success Message"
+  },
+  {
+   "default": "1",
+   "fieldname": "enabled",
+   "fieldtype": "Check",
+   "label": "Enabled"
+  },
+  {
+   "fieldname": "action_name",
+   "fieldtype": "Data",
+   "label": "Action Name",
+   "reqd": 1
+  },
+  {
+   "depends_on": "eval: doc.action == \"Custom Function\";",
+   "fieldname": "custom_function_path",
+   "fieldtype": "Small Text",
+   "label": "Custom Function Path",
+   "mandatory_depends_on": "eval: doc.action == \"Custom Function\";"
+  },
+  {
+   "fieldname": "fields_tab",
+   "fieldtype": "Tab Break",
+   "label": "Fields"
+  },
+  {
+   "fieldname": "fields",
+   "fieldtype": "Table",
+   "label": "Fields",
+   "options": "Raven Message Action Fields"
+  },
+  {
+   "fieldname": "dialog_properties_tab",
+   "fieldtype": "Tab Break",
+   "label": "Dialog Properties"
+  }
+ ],
+ "index_web_pages_for_search": 1,
+ "links": [],
+ "modified": "2024-10-16 11:25:19.124250",
+ "modified_by": "Administrator",
+ "module": "Raven Integrations",
+ "name": "Raven Message Action",
+ "naming_rule": "Random",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "search_fields": "action_name",
+ "show_title_field_in_link": 1,
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": [],
+ "title_field": "action_name"
+}
\ No newline at end of file
diff --git a/raven/raven_integrations/doctype/raven_message_action/raven_message_action.py b/raven/raven_integrations/doctype/raven_message_action/raven_message_action.py
new file mode 100644
index 000000000..495f37bb8
--- /dev/null
+++ b/raven/raven_integrations/doctype/raven_message_action/raven_message_action.py
@@ -0,0 +1,62 @@
+# Copyright (c) 2024, The Commit Company (Algocode Technologies Pvt. Ltd.) and contributors
+# For license information, please see license.txt
+
+import frappe
+from frappe import _, is_whitelisted
+from frappe.model.document import Document
+
+
+class RavenMessageAction(Document):
+	# begin: auto-generated types
+	# This code is auto-generated. Do not modify anything in this block.
+
+	from typing import TYPE_CHECKING
+
+	if TYPE_CHECKING:
+		from frappe.types import DF
+
+		from raven.raven_integrations.doctype.raven_message_action_fields.raven_message_action_fields import (
+			RavenMessageActionFields,
+		)
+
+		action: DF.Literal["Create Document", "Custom Function"]
+		action_name: DF.Data
+		custom_function_path: DF.SmallText | None
+		description: DF.SmallText | None
+		document_type: DF.Link | None
+		enabled: DF.Check
+		fields: DF.Table[RavenMessageActionFields]
+		success_message: DF.SmallText | None
+		title: DF.Data
+	# end: auto-generated types
+
+	def validate(self):
+
+		self.validate_action_type()
+		self.validate_custom_function_path()
+		self.validate_doctype_fields()
+
+	def validate_action_type(self):
+		if self.action == "Create Document":
+			if not self.document_type:
+				frappe.throw(_("Document Type is required."))
+		elif self.action == "Custom Function":
+			if not self.custom_function_path:
+				frappe.throw(_("Function Path is required."))
+
+	def validate_custom_function_path(self):
+		if self.action == "Custom Function":
+			f = frappe.get_attr(self.custom_function_path)
+			if not f:
+				frappe.throw(_("Function {0} not found.").format(self.custom_function_path))
+
+			is_whitelisted(f)
+
+	def validate_doctype_fields(self):
+		if self.action == "Create Document":
+			doctype = frappe.get_meta(self.document_type)
+			for param in self.fields:
+				field = doctype.get_field(param.fieldname)
+
+				if not field:
+					frappe.throw(_("Field {0} not found in {1}").format(param.fieldname, self.document_type))
diff --git a/raven/raven_integrations/doctype/raven_message_action/test_raven_message_action.py b/raven/raven_integrations/doctype/raven_message_action/test_raven_message_action.py
new file mode 100644
index 000000000..afcbc0213
--- /dev/null
+++ b/raven/raven_integrations/doctype/raven_message_action/test_raven_message_action.py
@@ -0,0 +1,29 @@
+# Copyright (c) 2024, The Commit Company (Algocode Technologies Pvt. Ltd.) and Contributors
+# See license.txt
+
+# import frappe
+from frappe.tests import IntegrationTestCase, UnitTestCase
+
+# On IntegrationTestCase, the doctype test records and all
+# link-field test record depdendencies are recursively loaded
+# Use these module variables to add/remove to/from that list
+EXTRA_TEST_RECORD_DEPENDENCIES = []  # eg. ["User"]
+IGNORE_TEST_RECORD_DEPENDENCIES = []  # eg. ["User"]
+
+
+class TestRavenMessageAction(UnitTestCase):
+	"""
+	Unit tests for RavenMessageAction.
+	Use this class for testing individual functions and methods.
+	"""
+
+	pass
+
+
+class TestRavenMessageAction(IntegrationTestCase):
+	"""
+	Integration tests for RavenMessageAction.
+	Use this class for testing interactions between multiple components.
+	"""
+
+	pass
diff --git a/raven/raven_integrations/doctype/raven_message_action_fields/__init__.py b/raven/raven_integrations/doctype/raven_message_action_fields/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/raven/raven_integrations/doctype/raven_message_action_fields/raven_message_action_fields.json b/raven/raven_integrations/doctype/raven_message_action_fields/raven_message_action_fields.json
new file mode 100644
index 000000000..b30026afb
--- /dev/null
+++ b/raven/raven_integrations/doctype/raven_message_action_fields/raven_message_action_fields.json
@@ -0,0 +1,93 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "creation": "2024-10-16 11:17:20.935886",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "fieldname",
+  "label",
+  "helper_text",
+  "is_required",
+  "column_break_gsrk",
+  "type",
+  "options",
+  "default_values_section",
+  "default_value_type",
+  "default_value"
+ ],
+ "fields": [
+  {
+   "fieldname": "fieldname",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Fieldname",
+   "reqd": 1
+  },
+  {
+   "fieldname": "label",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Label",
+   "reqd": 1
+  },
+  {
+   "fieldname": "helper_text",
+   "fieldtype": "Data",
+   "label": "Helper Text",
+   "length": 300
+  },
+  {
+   "fieldname": "default_value",
+   "fieldtype": "Small Text",
+   "label": "Default Value"
+  },
+  {
+   "fieldname": "column_break_gsrk",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "type",
+   "fieldtype": "Select",
+   "in_list_view": 1,
+   "label": "Type",
+   "options": "Data\nNumber\nSelect\nLink\nDate\nTime\nDatetime\nSmall Text\nCheckbox",
+   "reqd": 1
+  },
+  {
+   "fieldname": "options",
+   "fieldtype": "Small Text",
+   "label": "Options"
+  },
+  {
+   "default": "0",
+   "fieldname": "is_required",
+   "fieldtype": "Check",
+   "label": "Is Required?"
+  },
+  {
+   "fieldname": "default_values_section",
+   "fieldtype": "Section Break",
+   "label": "Default Values"
+  },
+  {
+   "fieldname": "default_value_type",
+   "fieldtype": "Select",
+   "label": "Default Value Type",
+   "options": "Static\nMessage Field\nJinja"
+  }
+ ],
+ "index_web_pages_for_search": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2024-10-16 11:22:03.745105",
+ "modified_by": "Administrator",
+ "module": "Raven Integrations",
+ "name": "Raven Message Action Fields",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
+}
\ No newline at end of file
diff --git a/raven/raven_integrations/doctype/raven_message_action_fields/raven_message_action_fields.py b/raven/raven_integrations/doctype/raven_message_action_fields/raven_message_action_fields.py
new file mode 100644
index 000000000..5007f2501
--- /dev/null
+++ b/raven/raven_integrations/doctype/raven_message_action_fields/raven_message_action_fields.py
@@ -0,0 +1,32 @@
+# Copyright (c) 2024, The Commit Company (Algocode Technologies Pvt. Ltd.) and contributors
+# For license information, please see license.txt
+
+# import frappe
+from frappe.model.document import Document
+
+
+class RavenMessageActionFields(Document):
+	# begin: auto-generated types
+	# This code is auto-generated. Do not modify anything in this block.
+
+	from typing import TYPE_CHECKING
+
+	if TYPE_CHECKING:
+		from frappe.types import DF
+
+		default_value: DF.SmallText | None
+		default_value_type: DF.Literal["Static", "Message Field", "Jinja"]
+		fieldname: DF.Data
+		helper_text: DF.Data | None
+		is_required: DF.Check
+		label: DF.Data
+		options: DF.SmallText | None
+		parent: DF.Data
+		parentfield: DF.Data
+		parenttype: DF.Data
+		type: DF.Literal[
+			"Data", "Number", "Select", "Link", "Date", "Time", "Datetime", "Small Text", "Checkbox"
+		]
+	# end: auto-generated types
+
+	pass