diff --git a/app/plugins/builtins/mail/services.py b/app/plugins/builtins/mail/services.py
index 506c7ab..57a3506 100644
--- a/app/plugins/builtins/mail/services.py
+++ b/app/plugins/builtins/mail/services.py
@@ -844,11 +844,15 @@ def mail_to_response(
         "in_reply_to": mail.in_reply_to,
         "subject": mail.subject,
         "from_address": mail.from_address,
-        "to_addresses": mail.to_addresses,
-        "cc_addresses": mail.cc_addresses,
-        "bcc_addresses": mail.bcc_addresses,
+        "from_name": mail.from_address.split("<")[0].strip().strip('"') if "<" in mail.from_address else mail.from_address,
+        "to_addresses": extract_email_addresses(mail.to_addresses) if mail.to_addresses else [],
+        "cc_addresses": extract_email_addresses(mail.cc_addresses) if mail.cc_addresses else [],
+        "bcc_addresses": extract_email_addresses(mail.bcc_addresses) if mail.bcc_addresses else [],
         "body_text": mail.body_text,
+        "body_html": mail.body_html if mail.body_html else None,
         "body_html_sanitized": mail.body_html_sanitized,
+        "sanitized_html": mail.body_html_sanitized,
+        "date": mail.received_at.isoformat() if mail.received_at else (mail.sent_at.isoformat() if mail.sent_at else None),
         "is_seen": mail.is_seen,
         "is_flagged": mail.is_flagged,
         "is_draft": mail.is_draft,