diff --git a/surfsense_backend/app/services/gmail/tool_metadata_service.py b/surfsense_backend/app/services/gmail/tool_metadata_service.py
index bc3685ac6..2f9bc463f 100644
--- a/surfsense_backend/app/services/gmail/tool_metadata_service.py
+++ b/surfsense_backend/app/services/gmail/tool_metadata_service.py
@@ -29,7 +29,10 @@ class GmailAccount:
 
     @classmethod
     def from_connector(cls, connector: SearchSourceConnector) -> "GmailAccount":
-        return cls(id=connector.id, name=connector.name, email="")
+        email = ""
+        if connector.name and " - " in connector.name:
+            email = connector.name.split(" - ", 1)[1]
+        return cls(id=connector.id, name=connector.name, email=email)
 
     def to_dict(self) -> dict:
         return {"id": self.id, "name": self.name, "email": self.email}
diff --git a/surfsense_backend/app/tasks/chat/stream_new_chat.py b/surfsense_backend/app/tasks/chat/stream_new_chat.py
index 7abd22d4a..0d72d8a2c 100644
--- a/surfsense_backend/app/tasks/chat/stream_new_chat.py
+++ b/surfsense_backend/app/tasks/chat/stream_new_chat.py
@@ -873,6 +873,12 @@ async def _stream_agent_events(
                 "delete_linear_issue",
                 "create_google_drive_file",
                 "delete_google_drive_file",
+                "create_gmail_draft",
+                "send_gmail_email",
+                "trash_gmail_email",
+                "create_google_calendar_event",
+                "update_google_calendar_event",
+                "delete_google_calendar_event",
             ):
                 yield streaming_service.format_tool_output_available(
                     tool_call_id,