diff --git a/frontend/src/components/CommunicationArea.vue b/frontend/src/components/CommunicationArea.vue
index cb7f12c9..bed61237 100644
--- a/frontend/src/components/CommunicationArea.vue
+++ b/frontend/src/components/CommunicationArea.vue
@@ -55,6 +55,7 @@
       v-model="doc.data"
       v-model:attachments="attachments"
       :doctype="doctype"
+      :subject="subject"
       placeholder="Add a reply..."
     />
   </div>
@@ -87,6 +88,16 @@ const newEmailEditor = ref(null)
 const sendEmailRef = ref(null)
 const attachments = ref([])
 
+const subject = computed(() => {
+  let prefix = ''
+  if (doc.value.data?.lead_name) {
+    prefix = doc.value.data.lead_name
+  } else if (doc.value.data?.organization) {
+    prefix = doc.value.data.organization
+  }
+  return `${prefix} (#${doc.value.data.name})`
+})
+
 watch(
   () => showCommunicationBox.value,
   (value) => {
@@ -106,6 +117,7 @@ const onNewEmailChange = (value) => {
 
 async function sendMail() {
   let recipients = newEmailEditor.value.toEmails
+  let subject = newEmailEditor.value.subject
   let cc = newEmailEditor.value.ccEmails
   let bcc = newEmailEditor.value.bccEmails
   await call('frappe.core.doctype.communication.email.make', {
@@ -113,7 +125,7 @@ async function sendMail() {
     attachments: attachments.value.map((x) => x.name),
     cc: cc.join(', '),
     bcc: bcc.join(', '),
-    subject: 'Email from Agent',
+    subject: subject,
     content: newEmail.value,
     doctype: props.doctype,
     name: doc.value.data.name,
diff --git a/frontend/src/components/EmailEditor.vue b/frontend/src/components/EmailEditor.vue
index b0292dd3..b117172e 100644
--- a/frontend/src/components/EmailEditor.vue
+++ b/frontend/src/components/EmailEditor.vue
@@ -9,6 +9,13 @@
     :editable="editable"
   >
     <template #top>
+      <div class="mx-10 flex items-center gap-2 border-t py-2.5">
+        <span class="text-xs text-gray-500">SUBJECT:</span>
+        <TextInput
+          class="flex-1 border-none bg-white hover:bg-white focus:border-none focus:!shadow-none focus-visible:!ring-0"
+          v-model="subject"
+        />
+      </div>
       <div
         class="mx-10 flex items-center gap-2 border-t py-2.5"
         :class="[cc || bcc ? '' : 'border-b']"
@@ -136,6 +143,10 @@ const props = defineProps({
     type: String,
     default: 'CRM Lead',
   },
+  subject: {
+    type: String,
+    default: 'Email from Lead',
+  },
   editorProps: {
     type: Object,
     default: () => ({}),
@@ -158,6 +169,7 @@ const textEditor = ref(null)
 const cc = ref(false)
 const bcc = ref(false)
 
+const subject = ref(props.subject)
 const toEmails = ref(modelValue.value.email ? [modelValue.value.email] : [])
 const ccEmails = ref([])
 const bccEmails = ref([])
@@ -170,7 +182,7 @@ function removeAttachment(attachment) {
   attachments.value = attachments.value.filter((a) => a !== attachment)
 }
 
-defineExpose({ editor, cc, bcc, toEmails, ccEmails, bccEmails })
+defineExpose({ editor, subject, cc, bcc, toEmails, ccEmails, bccEmails })
 
 const textEditorMenuButtons = [
   'Paragraph',