diff --git a/mail_client/mail_client/doctype/incoming_mail/incoming_mail.json b/mail_client/mail_client/doctype/incoming_mail/incoming_mail.json
index 24f0f6fc..9132baea 100644
--- a/mail_client/mail_client/doctype/incoming_mail/incoming_mail.json
+++ b/mail_client/mail_client/doctype/incoming_mail/incoming_mail.json
@@ -53,6 +53,7 @@
   "dmarc_description",
   "section_break_qijk",
   "message",
+  "section_break_vtax",
   "amended_from"
  ],
  "fields": [
@@ -119,8 +120,10 @@
    "fieldtype": "Column Break"
   },
   {
+   "collapsible": 1,
    "fieldname": "section_break_eomq",
-   "fieldtype": "Section Break"
+   "fieldtype": "Section Break",
+   "label": "Body"
   },
   {
    "fieldname": "display_name",
@@ -149,8 +152,10 @@
    "fieldtype": "Column Break"
   },
   {
+   "collapsible": 1,
    "fieldname": "section_break_qijk",
-   "fieldtype": "Section Break"
+   "fieldtype": "Section Break",
+   "label": "Message"
   },
   {
    "fieldname": "spf_description",
@@ -426,13 +431,17 @@
    "label": "Incoming Mail Log",
    "no_copy": 1,
    "read_only": 1
+  },
+  {
+   "fieldname": "section_break_vtax",
+   "fieldtype": "Section Break"
   }
  ],
  "in_create": 1,
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2024-11-16 15:35:14.385560",
+ "modified": "2024-11-18 13:33:53.161839",
  "modified_by": "Administrator",
  "module": "Mail Client",
  "name": "Incoming Mail",
diff --git a/mail_client/mail_client/doctype/incoming_mail/incoming_mail.py b/mail_client/mail_client/doctype/incoming_mail/incoming_mail.py
index 537b1f73..58dd2960 100644
--- a/mail_client/mail_client/doctype/incoming_mail/incoming_mail.py
+++ b/mail_client/mail_client/doctype/incoming_mail/incoming_mail.py
@@ -271,7 +271,7 @@ def create_incoming_mail(
 			except Exception:
 				frappe.log_error(
 					title="Submit Incoming Mail",
-					message=frappe.get_traceback(with_context=False),
+					message=frappe.get_traceback(with_context=True),
 				)
 
 	return doc
diff --git a/mail_client/mail_client/doctype/outgoing_mail/outgoing_mail.json b/mail_client/mail_client/doctype/outgoing_mail/outgoing_mail.json
index 06b9122c..e9abc1bb 100644
--- a/mail_client/mail_client/doctype/outgoing_mail/outgoing_mail.json
+++ b/mail_client/mail_client/doctype/outgoing_mail/outgoing_mail.json
@@ -91,8 +91,11 @@
    "fieldtype": "Section Break"
   },
   {
+   "collapsible": 1,
+   "collapsible_depends_on": "eval: doc.__islocal",
    "fieldname": "section_break_ijwo",
-   "fieldtype": "Section Break"
+   "fieldtype": "Section Break",
+   "label": "Body"
   },
   {
    "default": "Draft",
@@ -128,8 +131,10 @@
    "fieldtype": "Column Break"
   },
   {
+   "collapsible": 1,
    "fieldname": "section_break_kops",
-   "fieldtype": "Section Break"
+   "fieldtype": "Section Break",
+   "label": "Message"
   },
   {
    "fieldname": "body_plain",
@@ -152,8 +157,11 @@
    "options": "Mail Header"
   },
   {
+   "collapsible": 1,
+   "collapsible_depends_on": "eval: doc.custom_headers.length > 0",
    "fieldname": "section_break_atoq",
-   "fieldtype": "Section Break"
+   "fieldtype": "Section Break",
+   "label": "Custom Headers"
   },
   {
    "fieldname": "amended_from",
@@ -316,8 +324,10 @@
   {
    "fieldname": "raw_message",
    "fieldtype": "Code",
+   "hidden": 1,
    "label": "Raw Message",
-   "no_copy": 1
+   "no_copy": 1,
+   "read_only": 1
   },
   {
    "fieldname": "section_break_ubzr",
@@ -461,7 +471,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2024-11-16 15:35:03.128521",
+ "modified": "2024-11-18 13:28:37.419469",
  "modified_by": "Administrator",
  "module": "Mail Client",
  "name": "Outgoing Mail",