plotday · KrisBraun · Jun 5, 2026 · Jun 4, 2026 · plotday · KrisBraun
diff --git a/connectors/gmail/src/gmail-api.test.ts b/connectors/gmail/src/gmail-api.test.ts
@@ -0,0 +1,173 @@
+import { describe, expect, it } from "vitest";
+import {
+ stripQuotedReply,
+ transformGmailThread,
+ type GmailMessage,
+ type GmailMessagePart,
+ type GmailThread,
+} from "./gmail-api";
+
+// Gmail API returns part bodies as base64url. Encode fixtures the same way the
+// real API does so `extractBody`'s atob/replace decode path is exercised.
+function b64url(s: string): string {
+ return Buffer.from(s, "utf8")
+ .toString("base64")
+ .replace(/\+/g, "-")
+ .replace(/\//g, "_");
+}
+
+function part(
+ mimeType: string,
+ opts: {
+ data?: string;
+ parts?: GmailMessagePart[];
+ headers?: Array<[string, string]>;
+ filename?: string;
+ } = {}
+): GmailMessagePart {
+ return {
+ mimeType,
+ filename: opts.filename,
+ headers: (opts.headers ?? []).map(([name, value]) => ({ name, value })),
+ body:
+ opts.data !== undefined
+ ? { size: opts.data.length, data: b64url(opts.data) }
+ : undefined,
+ parts: opts.parts,
+ };
+}
+
+function thread(opts: {
+ from: string;
+ to?: string;
+ subject?: string;
+ snippet?: string;
+ payload: GmailMessagePart;
+}): GmailThread {
+ const headers = [
+ { name: "From", value: opts.from },
+ ...(opts.to ? [{ name: "To", value: opts.to }] : []),
+ ...(opts.subject ? [{ name: "Subject", value: opts.subject }] : []),
+ ];
+ const message: GmailMessage = {
+ id: "msg-1",
+ threadId: "thread-1",
+ labelIds: ["INBOX"],
+ snippet: opts.snippet ?? "snippet-without-body-marker",
+ historyId: "1",
+ internalDate: "1700000000000",
+ payload: { ...opts.payload, headers: [...headers, ...opts.payload.headers] },
+ sizeEstimate: 1000,
+ };
+ return { id: "thread-1", historyId: "1", messages: [message] };
+}
+
+function firstNoteContent(t: GmailThread): string {
+ const result = transformGmailThread(t);
+ return result.notes?.[0]?.content ?? "";
+}
+
+describe("forwarded email body extraction", () => {
+ it("keeps the body of an inline HTML forward (Gmail wraps it in gmail_quote)", () => {
+ // Gmail's "Forward" composes the original inside <div class="gmail_quote">,
+ // the SAME wrapper it uses for reply quotes — so the reply-stripper wrongly
+ // deletes the forwarded content, leaving an empty note.
+ const html =
+ '<div dir="ltr"><br>' +
+ '<div class="gmail_quote gmail_quote_container">' +
+ '<div dir="ltr" class="gmail_attr">---------- Forwarded message ---------<br>' +
+ "From: <strong>Porter Airlines</strong> &lt;flyporter@notifications.flyporter.com&gt;<br>" +
+ "Date: Wed, Aug 19, 2026<br>Subject: Booking details<br>To: Kris<br></div><br>" +
+ "<div>Your booking is confirmed. Confirmation code: BOOKINGCONFIRM123. Gate at YYZ.</div>" +
+ "</div></div>";
+ const t = thread({
+ from: "Forwarder <fwd@example.com>",
+ to: "kris@plot.day",
+ subject: "Fwd: Booking details",
+ payload: part("multipart/alternative", {
+ parts: [
+ part("text/plain", {
+ data:
+ "---------- Forwarded message ---------\r\nFrom: Porter Airlines\r\n\r\n" +
+ "Your booking is confirmed. Confirmation code: BOOKINGCONFIRM123.",
+ }),
+ part("text/html", { data: html }),
+ ],
+ }),
+ });
+ expect(firstNoteContent(t)).toContain("BOOKINGCONFIRM123");
+ });
+
+ it("keeps the body of a plain-text forward", () => {
+ const t = thread({
+ from: "Forwarder <fwd@example.com>",
+ to: "kris@plot.day",
+ subject: "Fwd: Booking details",
+ // Exact 10/10-dash separator that the strip path matches literally.
+ payload: part("text/plain", {
+ data:
+ "---------- Forwarded message ----------\r\n" +
+ "From: Porter Airlines\r\nSubject: Booking details\r\n\r\n" +
+ "Your booking is confirmed. Confirmation code: PLAINFWD456.",
+ }),
+ });
+ expect(firstNoteContent(t)).toContain("PLAINFWD456");
+ });
+
+ it("keeps the body of a forward attached as message/rfc822", () => {
+ const t = thread({
+ from: "Forwarder <fwd@example.com>",
+ to: "kris@plot.day",
+ subject: "Fwd: Booking details",
+ payload: part("multipart/mixed", {
+ parts: [
+ part("text/plain", { data: "" }), // forwarder added no note
+ part("message/rfc822", {
+ parts: [
+ part("multipart/alternative", {
+ parts: [
+ part("text/plain", {
+ data:
+ "Your booking is confirmed. Confirmation code: RFC822FWD789.",
+ }),
+ part("text/html", {
+ data:
+ "<div>Your booking is confirmed. Confirmation code: RFC822FWD789.</div>",
+ }),
+ ],
+ }),
+ ],
+ }),
+ ],
+ }),
+ });
+ expect(firstNoteContent(t)).toContain("RFC822FWD789");
+ });
+
+ it("still strips quoted replies (regression guard — HTML)", () => {
+ const html =
+ '<div dir="ltr">Thanks, that works for me!' +
+ '<div class="gmail_quote">' +
+ '<div dir="ltr" class="gmail_attr">On Mon, Jun 1, 2026 at 9:00 AM Bob &lt;bob@example.com&gt; wrote:<br></div>' +
+ '<blockquote class="gmail_quote">SECRETQUOTEDREPLY must be stripped</blockquote>' +
+ "</div></div>";
+ const t = thread({
+ from: "Bob <bob@example.com>",
+ to: "kris@plot.day",
+ subject: "Re: lunch",
+ payload: part("text/html", { data: html }),
+ });
+ const content = firstNoteContent(t);
+ expect(content).toContain("Thanks, that works for me!");
+ expect(content).not.toContain("SECRETQUOTEDREPLY");
+ });
+
+ it("still strips quoted replies (regression guard — plain text)", () => {
+ const reply = stripQuotedReply(
+ "My answer is yes.\r\nOn Mon, Jun 1, 2026, Bob wrote:\r\n> old message text",
+ "text"
+ );
+ expect(reply).toContain("My answer is yes.");
+ expect(reply).not.toContain("old message text");
+ });
+});
diff --git a/connectors/gmail/src/gmail-api.ts b/connectors/gmail/src/gmail-api.ts
@@ -416,39 +416,47 @@ export function getHeader(message: GmailMessage, name: string): string | null {
  * Returns raw content with its type so HTML can be converted server-side.
  */
 function extractBody(part: GmailMessagePart): { content: string; contentType: "text" | "html" } {
- // If this part has a body with data, return it
- if (part.body?.data) {
- // Gmail API returns base64url-encoded data — decode as UTF-8
- const binaryString = atob(part.body.data.replace(/-/g, "+").replace(/_/g, "/"));
- const bytes = new Uint8Array(binaryString.length);
- for (let i = 0; i < binaryString.length; i++) {
- bytes[i] = binaryString.charCodeAt(i);
- }
- const decoded = new TextDecoder("utf-8").decode(bytes);
- const contentType = part.mimeType === "text/html" ? "html" as const : "text" as const;
- return { content: decoded, contentType };
- }
+ // Prefer HTML over plain text — server-side conversion produces cleaner output.
+ // Search the WHOLE MIME tree, not just immediate children: forwarded messages
+ // nest the real body inside a `message/rfc822` part (or a deeper multipart),
+ // which the old immediate-children-only `find` missed, yielding an empty note.
+ const html = findPartContent(part, "text/html");
+ if (html) return { content: html, contentType: "html" };
 
- // If multipart, recursively search parts
- if (part.parts) {
- // Prefer HTML over plain text — server-side conversion produces cleaner output
- const htmlPart = part.parts.find((p) => p.mimeType === "text/html");
- if (htmlPart) {
- return extractBody(htmlPart);
- }
+ const text = findPartContent(part, "text/plain");
+ if (text) return { content: text, contentType: "text" };
 
- const textPart = part.parts.find((p) => p.mimeType === "text/plain");
- if (textPart) {
- return extractBody(textPart);
- }
+ return { content: "", contentType: "text" };
+}
 
- // Try first part as fallback
- if (part.parts.length > 0) {
- return extractBody(part.parts[0]);
+/**
+ * Recursively finds the first non-empty body of the given MIME type in a Gmail
+ * payload tree. Descends through multipart/* containers AND `message/rfc822`
+ * parts (a forwarded email attached inline carries its original payload there).
+ * Skips real attachments, whose bodies are binary and fetched separately.
+ */
+function findPartContent(part: GmailMessagePart, mimeType: string): string | null {
+ const isAttachment = !!part.filename && !!part.body?.attachmentId;
+ if (!isAttachment && part.mimeType === mimeType && part.body?.data) {
+ return decodeBase64Url(part.body.data);
+ }
+ if (part.parts) {
+ for (const child of part.parts) {
+ const found = findPartContent(child, mimeType);
+ if (found) return found;
  }
  }
+ return null;
+}
 
- return { content: "", contentType: "text" };
+/** Decodes Gmail's base64url-encoded part data as UTF-8. */
+function decodeBase64Url(data: string): string {
+ const binaryString = atob(data.replace(/-/g, "+").replace(/_/g, "/"));
+ const bytes = new Uint8Array(binaryString.length);
+ for (let i = 0; i < binaryString.length; i++) {
+ bytes[i] = binaryString.charCodeAt(i);
+ }
+ return new TextDecoder("utf-8").decode(bytes);
 }
 
 /**
@@ -487,6 +495,13 @@ export function stripQuotedReply(
 ): string {
  if (!content) return content;
 
+ // Forwarded messages: the forwarded email IS the content the user wants to
+ // read. Gmail/Apple Mail wrap a forward in the same quote container Gmail uses
+ // for reply quotes, so the reply-stripping below would delete the whole body
+ // and leave an empty note. Keep the content as-is when it's a forward whose
+ // marker precedes any reply boundary.
+ if (isForwardedMessage(content)) return content;
+
  if (contentType === "html") {
  // Gmail wraps quoted replies in <div class="gmail_quote">
  // Remove it and everything after it
@@ -573,19 +588,28 @@ export function stripQuotedReply(
  .trim();
  }
  }
-
- // Forwarded message separator
- if (line === "---------- Forwarded message ----------") {
- return lines
- .slice(0, i)
- .join("\n")
- .trim();
- }
  }
 
  return content;
 }
 
+/**
+ * Detects a forwarded message so {@link stripQuotedReply} can preserve it.
+ * Matches Gmail's dashed "---------- Forwarded message ---------" marker and
+ * Apple Mail's "Begin forwarded message:". Returns false when a reply boundary
+ * ("On … wrote:") precedes the forward marker — that's a reply quoting a
+ * forward, which the reply-stripper should still trim.
+ */
+function isForwardedMessage(content: string): boolean {
+ const fwdIdx = content.search(
+ /(-{2,}\s*Forwarded message\s*-{2,}|Begin forwarded message:)/i
+ );
+ if (fwdIdx === -1) return false;
+ const replyIdx = content.search(/On\s[\s\S]{0,200}?\swrote:/i);
+ if (replyIdx !== -1 && replyIdx < fwdIdx) return false;
+ return true;
+}
+
 /**
  * Recursively collects attachment parts from a Gmail message payload.
  * An attachment part has a non-empty filename and a body.attachmentId.

diff --git a/connectors/gmail/src/gmail-api.test.ts b/connectors/gmail/src/gmail-api.test.ts
@@ -0,0 +1,173 @@
+import { describe, expect, it } from "vitest";
+import {
+ stripQuotedReply,
+ transformGmailThread,
+ type GmailMessage,
+ type GmailMessagePart,
+ type GmailThread,
+} from "./gmail-api";
+
+// Gmail API returns part bodies as base64url. Encode fixtures the same way the
+// real API does so `extractBody`'s atob/replace decode path is exercised.
+function b64url(s: string): string {
+ return Buffer.from(s, "utf8")
+ .toString("base64")
+ .replace(/\+/g, "-")
+ .replace(/\//g, "_");
+}
+
+function part(
+ mimeType: string,
+ opts: {
+ data?: string;
+ parts?: GmailMessagePart[];
+ headers?: Array<[string, string]>;
+ filename?: string;
+ } = {}
+): GmailMessagePart {
+ return {
+ mimeType,
+ filename: opts.filename,
+ headers: (opts.headers ?? []).map(([name, value]) => ({ name, value })),
+ body:
+ opts.data !== undefined
+ ? { size: opts.data.length, data: b64url(opts.data) }
+ : undefined,
+ parts: opts.parts,
+ };
+}
+
+function thread(opts: {
+ from: string;
+ to?: string;
+ subject?: string;
+ snippet?: string;
+ payload: GmailMessagePart;
+}): GmailThread {
+ const headers = [
+ { name: "From", value: opts.from },
+ ...(opts.to ? [{ name: "To", value: opts.to }] : []),
+ ...(opts.subject ? [{ name: "Subject", value: opts.subject }] : []),
+ ];
+ const message: GmailMessage = {
+ id: "msg-1",
+ threadId: "thread-1",
+ labelIds: ["INBOX"],
+ snippet: opts.snippet ?? "snippet-without-body-marker",
+ historyId: "1",
+ internalDate: "1700000000000",
+ payload: { ...opts.payload, headers: [...headers, ...opts.payload.headers] },
+ sizeEstimate: 1000,
+ };
+ return { id: "thread-1", historyId: "1", messages: [message] };
+}
+
+function firstNoteContent(t: GmailThread): string {
+ const result = transformGmailThread(t);
+ return result.notes?.[0]?.content ?? "";
+}
+
+describe("forwarded email body extraction", () => {
+ it("keeps the body of an inline HTML forward (Gmail wraps it in gmail_quote)", () => {
+ // Gmail's "Forward" composes the original inside <div class="gmail_quote">,
+ // the SAME wrapper it uses for reply quotes — so the reply-stripper wrongly
+ // deletes the forwarded content, leaving an empty note.
+ const html =
+ '<div dir="ltr"><br>' +
+ '<div class="gmail_quote gmail_quote_container">' +
+ '<div dir="ltr" class="gmail_attr">---------- Forwarded message ---------<br>' +
+ "From: <strong>Porter Airlines</strong> &lt;flyporter@notifications.flyporter.com&gt;<br>" +
+ "Date: Wed, Aug 19, 2026<br>Subject: Booking details<br>To: Kris<br></div><br>" +
+ "<div>Your booking is confirmed. Confirmation code: BOOKINGCONFIRM123. Gate at YYZ.</div>" +
+ "</div></div>";
+ const t = thread({
+ from: "Forwarder <fwd@example.com>",
+ to: "kris@plot.day",
+ subject: "Fwd: Booking details",
+ payload: part("multipart/alternative", {
+ parts: [
+ part("text/plain", {
+ data:
+ "---------- Forwarded message ---------\r\nFrom: Porter Airlines\r\n\r\n" +
+ "Your booking is confirmed. Confirmation code: BOOKINGCONFIRM123.",
+ }),
+ part("text/html", { data: html }),
+ ],
+ }),
+ });
+ expect(firstNoteContent(t)).toContain("BOOKINGCONFIRM123");
+ });
+
+ it("keeps the body of a plain-text forward", () => {
+ const t = thread({
+ from: "Forwarder <fwd@example.com>",
+ to: "kris@plot.day",
+ subject: "Fwd: Booking details",
+ // Exact 10/10-dash separator that the strip path matches literally.
+ payload: part("text/plain", {
+ data:
+ "---------- Forwarded message ----------\r\n" +
+ "From: Porter Airlines\r\nSubject: Booking details\r\n\r\n" +
+ "Your booking is confirmed. Confirmation code: PLAINFWD456.",
+ }),
+ });
+ expect(firstNoteContent(t)).toContain("PLAINFWD456");
+ });
+
+ it("keeps the body of a forward attached as message/rfc822", () => {
+ const t = thread({
+ from: "Forwarder <fwd@example.com>",
+ to: "kris@plot.day",
+ subject: "Fwd: Booking details",
+ payload: part("multipart/mixed", {
+ parts: [
+ part("text/plain", { data: "" }), // forwarder added no note
+ part("message/rfc822", {
+ parts: [
+ part("multipart/alternative", {
+ parts: [
+ part("text/plain", {
+ data:
+ "Your booking is confirmed. Confirmation code: RFC822FWD789.",
+ }),
+ part("text/html", {
+ data:
+ "<div>Your booking is confirmed. Confirmation code: RFC822FWD789.</div>",
+ }),
+ ],
+ }),
+ ],
+ }),
+ ],
+ }),
+ });
+ expect(firstNoteContent(t)).toContain("RFC822FWD789");
+ });
+
+ it("still strips quoted replies (regression guard — HTML)", () => {
+ const html =
+ '<div dir="ltr">Thanks, that works for me!' +
+ '<div class="gmail_quote">' +
+ '<div dir="ltr" class="gmail_attr">On Mon, Jun 1, 2026 at 9:00 AM Bob &lt;bob@example.com&gt; wrote:<br></div>' +
+ '<blockquote class="gmail_quote">SECRETQUOTEDREPLY must be stripped</blockquote>' +
+ "</div></div>";
+ const t = thread({
+ from: "Bob <bob@example.com>",
+ to: "kris@plot.day",
+ subject: "Re: lunch",
+ payload: part("text/html", { data: html }),
+ });
+ const content = firstNoteContent(t);
+ expect(content).toContain("Thanks, that works for me!");
+ expect(content).not.toContain("SECRETQUOTEDREPLY");
+ });
+
+ it("still strips quoted replies (regression guard — plain text)", () => {
+ const reply = stripQuotedReply(
+ "My answer is yes.\r\nOn Mon, Jun 1, 2026, Bob wrote:\r\n> old message text",
+ "text"
+ );
+ expect(reply).toContain("My answer is yes.");
+ expect(reply).not.toContain("old message text");
+ });
+});
diff --git a/connectors/gmail/src/gmail-api.ts b/connectors/gmail/src/gmail-api.ts
@@ -416,39 +416,47 @@ export function getHeader(message: GmailMessage, name: string): string | null {
  * Returns raw content with its type so HTML can be converted server-side.
  */
 function extractBody(part: GmailMessagePart): { content: string; contentType: "text" | "html" } {
- // If this part has a body with data, return it
- if (part.body?.data) {
- // Gmail API returns base64url-encoded data — decode as UTF-8
- const binaryString = atob(part.body.data.replace(/-/g, "+").replace(/_/g, "/"));
- const bytes = new Uint8Array(binaryString.length);
- for (let i = 0; i < binaryString.length; i++) {
- bytes[i] = binaryString.charCodeAt(i);
- }
- const decoded = new TextDecoder("utf-8").decode(bytes);
- const contentType = part.mimeType === "text/html" ? "html" as const : "text" as const;
- return { content: decoded, contentType };
- }
+ // Prefer HTML over plain text — server-side conversion produces cleaner output.
+ // Search the WHOLE MIME tree, not just immediate children: forwarded messages
+ // nest the real body inside a `message/rfc822` part (or a deeper multipart),
+ // which the old immediate-children-only `find` missed, yielding an empty note.
+ const html = findPartContent(part, "text/html");
+ if (html) return { content: html, contentType: "html" };
 
- // If multipart, recursively search parts
- if (part.parts) {
- // Prefer HTML over plain text — server-side conversion produces cleaner output
- const htmlPart = part.parts.find((p) => p.mimeType === "text/html");
- if (htmlPart) {
- return extractBody(htmlPart);
- }
+ const text = findPartContent(part, "text/plain");
+ if (text) return { content: text, contentType: "text" };
 
- const textPart = part.parts.find((p) => p.mimeType === "text/plain");
- if (textPart) {
- return extractBody(textPart);
- }
+ return { content: "", contentType: "text" };
+}
 
- // Try first part as fallback
- if (part.parts.length > 0) {
- return extractBody(part.parts[0]);
+/**
+ * Recursively finds the first non-empty body of the given MIME type in a Gmail
+ * payload tree. Descends through multipart/* containers AND `message/rfc822`
+ * parts (a forwarded email attached inline carries its original payload there).
+ * Skips real attachments, whose bodies are binary and fetched separately.
+ */
+function findPartContent(part: GmailMessagePart, mimeType: string): string | null {
+ const isAttachment = !!part.filename && !!part.body?.attachmentId;
+ if (!isAttachment && part.mimeType === mimeType && part.body?.data) {
+ return decodeBase64Url(part.body.data);
+ }
+ if (part.parts) {
+ for (const child of part.parts) {
+ const found = findPartContent(child, mimeType);
+ if (found) return found;
  }
  }
+ return null;
+}
 
- return { content: "", contentType: "text" };
+/** Decodes Gmail's base64url-encoded part data as UTF-8. */
+function decodeBase64Url(data: string): string {
+ const binaryString = atob(data.replace(/-/g, "+").replace(/_/g, "/"));
+ const bytes = new Uint8Array(binaryString.length);
+ for (let i = 0; i < binaryString.length; i++) {
+ bytes[i] = binaryString.charCodeAt(i);
+ }
+ return new TextDecoder("utf-8").decode(bytes);
 }
 
 /**
@@ -487,6 +495,13 @@ export function stripQuotedReply(
 ): string {
  if (!content) return content;
 
+ // Forwarded messages: the forwarded email IS the content the user wants to
+ // read. Gmail/Apple Mail wrap a forward in the same quote container Gmail uses
+ // for reply quotes, so the reply-stripping below would delete the whole body
+ // and leave an empty note. Keep the content as-is when it's a forward whose
+ // marker precedes any reply boundary.
+ if (isForwardedMessage(content)) return content;
+
  if (contentType === "html") {
  // Gmail wraps quoted replies in <div class="gmail_quote">
  // Remove it and everything after it
@@ -573,19 +588,28 @@ export function stripQuotedReply(
  .trim();
  }
  }
-
- // Forwarded message separator
- if (line === "---------- Forwarded message ----------") {
- return lines
- .slice(0, i)
- .join("\n")
- .trim();
- }
  }
 
  return content;
 }
 
+/**
+ * Detects a forwarded message so {@link stripQuotedReply} can preserve it.
+ * Matches Gmail's dashed "---------- Forwarded message ---------" marker and
+ * Apple Mail's "Begin forwarded message:". Returns false when a reply boundary
+ * ("On … wrote:") precedes the forward marker — that's a reply quoting a
+ * forward, which the reply-stripper should still trim.
+ */
+function isForwardedMessage(content: string): boolean {
+ const fwdIdx = content.search(
+ /(-{2,}\s*Forwarded message\s*-{2,}|Begin forwarded message:)/i
+ );
+ if (fwdIdx === -1) return false;
+ const replyIdx = content.search(/On\s[\s\S]{0,200}?\swrote:/i);
+ if (replyIdx !== -1 && replyIdx < fwdIdx) return false;
+ return true;
+}
+
 /**
  * Recursively collects attachment parts from a Gmail message payload.
  * An attachment part has a non-empty filename and a body.attachmentId.

diff --git a/connectors/gmail/src/gmail-api.test.ts b/connectors/gmail/src/gmail-api.test.ts
@@ -0,0 +1,173 @@
+import { describe, expect, it } from "vitest";
+import {
+ stripQuotedReply,
+ transformGmailThread,
+ type GmailMessage,
+ type GmailMessagePart,
+ type GmailThread,
+} from "./gmail-api";
+
+// Gmail API returns part bodies as base64url. Encode fixtures the same way the
+// real API does so `extractBody`'s atob/replace decode path is exercised.
+function b64url(s: string): string {
+ return Buffer.from(s, "utf8")
+ .toString("base64")
+ .replace(/\+/g, "-")
+ .replace(/\//g, "_");
+}
+
+function part(
+ mimeType: string,
+ opts: {
+ data?: string;
+ parts?: GmailMessagePart[];
+ headers?: Array<[string, string]>;
+ filename?: string;
+ } = {}
+): GmailMessagePart {
+ return {
+ mimeType,
+ filename: opts.filename,
+ headers: (opts.headers ?? []).map(([name, value]) => ({ name, value })),
+ body:
+ opts.data !== undefined
+ ? { size: opts.data.length, data: b64url(opts.data) }
+ : undefined,
+ parts: opts.parts,
+ };
+}
+
+function thread(opts: {
+ from: string;
+ to?: string;
+ subject?: string;
+ snippet?: string;
+ payload: GmailMessagePart;
+}): GmailThread {
+ const headers = [
+ { name: "From", value: opts.from },
+ ...(opts.to ? [{ name: "To", value: opts.to }] : []),
+ ...(opts.subject ? [{ name: "Subject", value: opts.subject }] : []),
+ ];
+ const message: GmailMessage = {
+ id: "msg-1",
+ threadId: "thread-1",
+ labelIds: ["INBOX"],
+ snippet: opts.snippet ?? "snippet-without-body-marker",
+ historyId: "1",
+ internalDate: "1700000000000",
+ payload: { ...opts.payload, headers: [...headers, ...opts.payload.headers] },
+ sizeEstimate: 1000,
+ };
+ return { id: "thread-1", historyId: "1", messages: [message] };
+}
+
+function firstNoteContent(t: GmailThread): string {
+ const result = transformGmailThread(t);
+ return result.notes?.[0]?.content ?? "";
+}
+
+describe("forwarded email body extraction", () => {
+ it("keeps the body of an inline HTML forward (Gmail wraps it in gmail_quote)", () => {
+ // Gmail's "Forward" composes the original inside <div class="gmail_quote">,
+ // the SAME wrapper it uses for reply quotes — so the reply-stripper wrongly
+ // deletes the forwarded content, leaving an empty note.
+ const html =
+ '<div dir="ltr"><br>' +
+ '<div class="gmail_quote gmail_quote_container">' +
+ '<div dir="ltr" class="gmail_attr">---------- Forwarded message ---------<br>' +
+ "From: <strong>Porter Airlines</strong> &lt;flyporter@notifications.flyporter.com&gt;<br>" +
+ "Date: Wed, Aug 19, 2026<br>Subject: Booking details<br>To: Kris<br></div><br>" +
+ "<div>Your booking is confirmed. Confirmation code: BOOKINGCONFIRM123. Gate at YYZ.</div>" +
+ "</div></div>";
+ const t = thread({
+ from: "Forwarder <fwd@example.com>",
+ to: "kris@plot.day",
+ subject: "Fwd: Booking details",
+ payload: part("multipart/alternative", {
+ parts: [
+ part("text/plain", {
+ data:
+ "---------- Forwarded message ---------\r\nFrom: Porter Airlines\r\n\r\n" +
+ "Your booking is confirmed. Confirmation code: BOOKINGCONFIRM123.",
+ }),
+ part("text/html", { data: html }),
+ ],
+ }),
+ });
+ expect(firstNoteContent(t)).toContain("BOOKINGCONFIRM123");
+ });
+
+ it("keeps the body of a plain-text forward", () => {
+ const t = thread({
+ from: "Forwarder <fwd@example.com>",
+ to: "kris@plot.day",
+ subject: "Fwd: Booking details",
+ // Exact 10/10-dash separator that the strip path matches literally.
+ payload: part("text/plain", {
+ data:
+ "---------- Forwarded message ----------\r\n" +
+ "From: Porter Airlines\r\nSubject: Booking details\r\n\r\n" +
+ "Your booking is confirmed. Confirmation code: PLAINFWD456.",
+ }),
+ });
+ expect(firstNoteContent(t)).toContain("PLAINFWD456");
+ });
+
+ it("keeps the body of a forward attached as message/rfc822", () => {
+ const t = thread({
+ from: "Forwarder <fwd@example.com>",
+ to: "kris@plot.day",
+ subject: "Fwd: Booking details",
+ payload: part("multipart/mixed", {
+ parts: [
+ part("text/plain", { data: "" }), // forwarder added no note
+ part("message/rfc822", {
+ parts: [
+ part("multipart/alternative", {
+ parts: [
+ part("text/plain", {
+ data:
+ "Your booking is confirmed. Confirmation code: RFC822FWD789.",
+ }),
+ part("text/html", {
+ data:
+ "<div>Your booking is confirmed. Confirmation code: RFC822FWD789.</div>",
+ }),
+ ],
+ }),
+ ],
+ }),
+ ],
+ }),
+ });
+ expect(firstNoteContent(t)).toContain("RFC822FWD789");
+ });
+
+ it("still strips quoted replies (regression guard — HTML)", () => {
+ const html =
+ '<div dir="ltr">Thanks, that works for me!' +
+ '<div class="gmail_quote">' +
+ '<div dir="ltr" class="gmail_attr">On Mon, Jun 1, 2026 at 9:00 AM Bob &lt;bob@example.com&gt; wrote:<br></div>' +
+ '<blockquote class="gmail_quote">SECRETQUOTEDREPLY must be stripped</blockquote>' +
+ "</div></div>";
+ const t = thread({
+ from: "Bob <bob@example.com>",
+ to: "kris@plot.day",
+ subject: "Re: lunch",
+ payload: part("text/html", { data: html }),
+ });
+ const content = firstNoteContent(t);
+ expect(content).toContain("Thanks, that works for me!");
+ expect(content).not.toContain("SECRETQUOTEDREPLY");
+ });
+
+ it("still strips quoted replies (regression guard — plain text)", () => {
+ const reply = stripQuotedReply(
+ "My answer is yes.\r\nOn Mon, Jun 1, 2026, Bob wrote:\r\n> old message text",
+ "text"
+ );
+ expect(reply).toContain("My answer is yes.");
+ expect(reply).not.toContain("old message text");
+ });
+});
diff --git a/connectors/gmail/src/gmail-api.ts b/connectors/gmail/src/gmail-api.ts
@@ -416,39 +416,47 @@ export function getHeader(message: GmailMessage, name: string): string | null {
  * Returns raw content with its type so HTML can be converted server-side.
  */
 function extractBody(part: GmailMessagePart): { content: string; contentType: "text" | "html" } {
- // If this part has a body with data, return it
- if (part.body?.data) {
- // Gmail API returns base64url-encoded data — decode as UTF-8
- const binaryString = atob(part.body.data.replace(/-/g, "+").replace(/_/g, "/"));
- const bytes = new Uint8Array(binaryString.length);
- for (let i = 0; i < binaryString.length; i++) {
- bytes[i] = binaryString.charCodeAt(i);
- }
- const decoded = new TextDecoder("utf-8").decode(bytes);
- const contentType = part.mimeType === "text/html" ? "html" as const : "text" as const;
- return { content: decoded, contentType };
- }
+ // Prefer HTML over plain text — server-side conversion produces cleaner output.
+ // Search the WHOLE MIME tree, not just immediate children: forwarded messages
+ // nest the real body inside a `message/rfc822` part (or a deeper multipart),
+ // which the old immediate-children-only `find` missed, yielding an empty note.
+ const html = findPartContent(part, "text/html");
+ if (html) return { content: html, contentType: "html" };
 
- // If multipart, recursively search parts
- if (part.parts) {
- // Prefer HTML over plain text — server-side conversion produces cleaner output
- const htmlPart = part.parts.find((p) => p.mimeType === "text/html");
- if (htmlPart) {
- return extractBody(htmlPart);
- }
+ const text = findPartContent(part, "text/plain");
+ if (text) return { content: text, contentType: "text" };
 
- const textPart = part.parts.find((p) => p.mimeType === "text/plain");
- if (textPart) {
- return extractBody(textPart);
- }
+ return { content: "", contentType: "text" };
+}
 
- // Try first part as fallback
- if (part.parts.length > 0) {
- return extractBody(part.parts[0]);
+/**
+ * Recursively finds the first non-empty body of the given MIME type in a Gmail
+ * payload tree. Descends through multipart/* containers AND `message/rfc822`
+ * parts (a forwarded email attached inline carries its original payload there).
+ * Skips real attachments, whose bodies are binary and fetched separately.
+ */
+function findPartContent(part: GmailMessagePart, mimeType: string): string | null {
+ const isAttachment = !!part.filename && !!part.body?.attachmentId;
+ if (!isAttachment && part.mimeType === mimeType && part.body?.data) {
+ return decodeBase64Url(part.body.data);
+ }
+ if (part.parts) {
+ for (const child of part.parts) {
+ const found = findPartContent(child, mimeType);
+ if (found) return found;
  }
  }
+ return null;
+}
 
- return { content: "", contentType: "text" };
+/** Decodes Gmail's base64url-encoded part data as UTF-8. */
+function decodeBase64Url(data: string): string {
+ const binaryString = atob(data.replace(/-/g, "+").replace(/_/g, "/"));
+ const bytes = new Uint8Array(binaryString.length);
+ for (let i = 0; i < binaryString.length; i++) {
+ bytes[i] = binaryString.charCodeAt(i);
+ }
+ return new TextDecoder("utf-8").decode(bytes);
 }
 
 /**
@@ -487,6 +495,13 @@ export function stripQuotedReply(
 ): string {
  if (!content) return content;
 
+ // Forwarded messages: the forwarded email IS the content the user wants to
+ // read. Gmail/Apple Mail wrap a forward in the same quote container Gmail uses
+ // for reply quotes, so the reply-stripping below would delete the whole body
+ // and leave an empty note. Keep the content as-is when it's a forward whose
+ // marker precedes any reply boundary.
+ if (isForwardedMessage(content)) return content;
+
  if (contentType === "html") {
  // Gmail wraps quoted replies in <div class="gmail_quote">
  // Remove it and everything after it
@@ -573,19 +588,28 @@ export function stripQuotedReply(
  .trim();
  }
  }
-
- // Forwarded message separator
- if (line === "---------- Forwarded message ----------") {
- return lines
- .slice(0, i)
- .join("\n")
- .trim();
- }
  }
 
  return content;
 }
 
+/**
+ * Detects a forwarded message so {@link stripQuotedReply} can preserve it.
+ * Matches Gmail's dashed "---------- Forwarded message ---------" marker and
+ * Apple Mail's "Begin forwarded message:". Returns false when a reply boundary
+ * ("On … wrote:") precedes the forward marker — that's a reply quoting a
+ * forward, which the reply-stripper should still trim.
+ */
+function isForwardedMessage(content: string): boolean {
+ const fwdIdx = content.search(
+ /(-{2,}\s*Forwarded message\s*-{2,}|Begin forwarded message:)/i
+ );
+ if (fwdIdx === -1) return false;
+ const replyIdx = content.search(/On\s[\s\S]{0,200}?\swrote:/i);
+ if (replyIdx !== -1 && replyIdx < fwdIdx) return false;
+ return true;
+}
+
 /**
  * Recursively collects attachment parts from a Gmail message payload.
  * An attachment part has a non-empty filename and a body.attachmentId.

diff --git a/connectors/gmail/src/gmail-api.test.ts b/connectors/gmail/src/gmail-api.test.ts
@@ -0,0 +1,173 @@
+import { describe, expect, it } from "vitest";
+import {
+ stripQuotedReply,
+ transformGmailThread,
+ type GmailMessage,
+ type GmailMessagePart,
+ type GmailThread,
+} from "./gmail-api";
+
+// Gmail API returns part bodies as base64url. Encode fixtures the same way the
+// real API does so `extractBody`'s atob/replace decode path is exercised.
+function b64url(s: string): string {
+ return Buffer.from(s, "utf8")
+ .toString("base64")
+ .replace(/\+/g, "-")
+ .replace(/\//g, "_");
+}
+
+function part(
+ mimeType: string,
+ opts: {
+ data?: string;
+ parts?: GmailMessagePart[];
+ headers?: Array<[string, string]>;
+ filename?: string;
+ } = {}
+): GmailMessagePart {
+ return {
+ mimeType,
+ filename: opts.filename,
+ headers: (opts.headers ?? []).map(([name, value]) => ({ name, value })),
+ body:
+ opts.data !== undefined
+ ? { size: opts.data.length, data: b64url(opts.data) }
+ : undefined,
+ parts: opts.parts,
+ };
+}
+
+function thread(opts: {
+ from: string;
+ to?: string;
+ subject?: string;
+ snippet?: string;
+ payload: GmailMessagePart;
+}): GmailThread {
+ const headers = [
+ { name: "From", value: opts.from },
+ ...(opts.to ? [{ name: "To", value: opts.to }] : []),
+ ...(opts.subject ? [{ name: "Subject", value: opts.subject }] : []),
+ ];
+ const message: GmailMessage = {
+ id: "msg-1",
+ threadId: "thread-1",
+ labelIds: ["INBOX"],
+ snippet: opts.snippet ?? "snippet-without-body-marker",
+ historyId: "1",
+ internalDate: "1700000000000",
+ payload: { ...opts.payload, headers: [...headers, ...opts.payload.headers] },
+ sizeEstimate: 1000,
+ };
+ return { id: "thread-1", historyId: "1", messages: [message] };
+}
+
+function firstNoteContent(t: GmailThread): string {
+ const result = transformGmailThread(t);
+ return result.notes?.[0]?.content ?? "";
+}
+
+describe("forwarded email body extraction", () => {
+ it("keeps the body of an inline HTML forward (Gmail wraps it in gmail_quote)", () => {
+ // Gmail's "Forward" composes the original inside <div class="gmail_quote">,
+ // the SAME wrapper it uses for reply quotes — so the reply-stripper wrongly
+ // deletes the forwarded content, leaving an empty note.
+ const html =
+ '<div dir="ltr"><br>' +
+ '<div class="gmail_quote gmail_quote_container">' +
+ '<div dir="ltr" class="gmail_attr">---------- Forwarded message ---------<br>' +
+ "From: <strong>Porter Airlines</strong> &lt;flyporter@notifications.flyporter.com&gt;<br>" +
+ "Date: Wed, Aug 19, 2026<br>Subject: Booking details<br>To: Kris<br></div><br>" +
+ "<div>Your booking is confirmed. Confirmation code: BOOKINGCONFIRM123. Gate at YYZ.</div>" +
+ "</div></div>";
+ const t = thread({
+ from: "Forwarder <fwd@example.com>",
+ to: "kris@plot.day",
+ subject: "Fwd: Booking details",
+ payload: part("multipart/alternative", {
+ parts: [
+ part("text/plain", {
+ data:
+ "---------- Forwarded message ---------\r\nFrom: Porter Airlines\r\n\r\n" +
+ "Your booking is confirmed. Confirmation code: BOOKINGCONFIRM123.",
+ }),
+ part("text/html", { data: html }),
+ ],
+ }),
+ });
+ expect(firstNoteContent(t)).toContain("BOOKINGCONFIRM123");
+ });
+
+ it("keeps the body of a plain-text forward", () => {
+ const t = thread({
+ from: "Forwarder <fwd@example.com>",
+ to: "kris@plot.day",
+ subject: "Fwd: Booking details",
+ // Exact 10/10-dash separator that the strip path matches literally.
+ payload: part("text/plain", {
+ data:
+ "---------- Forwarded message ----------\r\n" +
+ "From: Porter Airlines\r\nSubject: Booking details\r\n\r\n" +
+ "Your booking is confirmed. Confirmation code: PLAINFWD456.",
+ }),
+ });
+ expect(firstNoteContent(t)).toContain("PLAINFWD456");
+ });
+
+ it("keeps the body of a forward attached as message/rfc822", () => {
+ const t = thread({
+ from: "Forwarder <fwd@example.com>",
+ to: "kris@plot.day",
+ subject: "Fwd: Booking details",
+ payload: part("multipart/mixed", {
+ parts: [
+ part("text/plain", { data: "" }), // forwarder added no note
+ part("message/rfc822", {
+ parts: [
+ part("multipart/alternative", {
+ parts: [
+ part("text/plain", {
+ data:
+ "Your booking is confirmed. Confirmation code: RFC822FWD789.",
+ }),
+ part("text/html", {
+ data:
+ "<div>Your booking is confirmed. Confirmation code: RFC822FWD789.</div>",
+ }),
+ ],
+ }),
+ ],
+ }),
+ ],
+ }),
+ });
+ expect(firstNoteContent(t)).toContain("RFC822FWD789");
+ });
+
+ it("still strips quoted replies (regression guard — HTML)", () => {
+ const html =
+ '<div dir="ltr">Thanks, that works for me!' +
+ '<div class="gmail_quote">' +
+ '<div dir="ltr" class="gmail_attr">On Mon, Jun 1, 2026 at 9:00 AM Bob &lt;bob@example.com&gt; wrote:<br></div>' +
+ '<blockquote class="gmail_quote">SECRETQUOTEDREPLY must be stripped</blockquote>' +
+ "</div></div>";
+ const t = thread({
+ from: "Bob <bob@example.com>",
+ to: "kris@plot.day",
+ subject: "Re: lunch",
+ payload: part("text/html", { data: html }),
+ });
+ const content = firstNoteContent(t);
+ expect(content).toContain("Thanks, that works for me!");
+ expect(content).not.toContain("SECRETQUOTEDREPLY");
+ });
+
+ it("still strips quoted replies (regression guard — plain text)", () => {
+ const reply = stripQuotedReply(
+ "My answer is yes.\r\nOn Mon, Jun 1, 2026, Bob wrote:\r\n> old message text",
+ "text"
+ );
+ expect(reply).toContain("My answer is yes.");
+ expect(reply).not.toContain("old message text");
+ });
+});
diff --git a/connectors/gmail/src/gmail-api.ts b/connectors/gmail/src/gmail-api.ts
@@ -416,39 +416,47 @@ export function getHeader(message: GmailMessage, name: string): string | null {
  * Returns raw content with its type so HTML can be converted server-side.
  */
 function extractBody(part: GmailMessagePart): { content: string; contentType: "text" | "html" } {
- // If this part has a body with data, return it
- if (part.body?.data) {
- // Gmail API returns base64url-encoded data — decode as UTF-8
- const binaryString = atob(part.body.data.replace(/-/g, "+").replace(/_/g, "/"));
- const bytes = new Uint8Array(binaryString.length);
- for (let i = 0; i < binaryString.length; i++) {
- bytes[i] = binaryString.charCodeAt(i);
- }
- const decoded = new TextDecoder("utf-8").decode(bytes);
- const contentType = part.mimeType === "text/html" ? "html" as const : "text" as const;
- return { content: decoded, contentType };
- }
+ // Prefer HTML over plain text — server-side conversion produces cleaner output.
+ // Search the WHOLE MIME tree, not just immediate children: forwarded messages
+ // nest the real body inside a `message/rfc822` part (or a deeper multipart),
+ // which the old immediate-children-only `find` missed, yielding an empty note.
+ const html = findPartContent(part, "text/html");
+ if (html) return { content: html, contentType: "html" };
 
- // If multipart, recursively search parts
- if (part.parts) {
- // Prefer HTML over plain text — server-side conversion produces cleaner output
- const htmlPart = part.parts.find((p) => p.mimeType === "text/html");
- if (htmlPart) {
- return extractBody(htmlPart);
- }
+ const text = findPartContent(part, "text/plain");
+ if (text) return { content: text, contentType: "text" };
 
- const textPart = part.parts.find((p) => p.mimeType === "text/plain");
- if (textPart) {
- return extractBody(textPart);
- }
+ return { content: "", contentType: "text" };
+}
 
- // Try first part as fallback
- if (part.parts.length > 0) {
- return extractBody(part.parts[0]);
+/**
+ * Recursively finds the first non-empty body of the given MIME type in a Gmail
+ * payload tree. Descends through multipart/* containers AND `message/rfc822`
+ * parts (a forwarded email attached inline carries its original payload there).
+ * Skips real attachments, whose bodies are binary and fetched separately.
+ */
+function findPartContent(part: GmailMessagePart, mimeType: string): string | null {
+ const isAttachment = !!part.filename && !!part.body?.attachmentId;
+ if (!isAttachment && part.mimeType === mimeType && part.body?.data) {
+ return decodeBase64Url(part.body.data);
+ }
+ if (part.parts) {
+ for (const child of part.parts) {
+ const found = findPartContent(child, mimeType);
+ if (found) return found;
  }
  }
+ return null;
+}
 
- return { content: "", contentType: "text" };
+/** Decodes Gmail's base64url-encoded part data as UTF-8. */
+function decodeBase64Url(data: string): string {
+ const binaryString = atob(data.replace(/-/g, "+").replace(/_/g, "/"));
+ const bytes = new Uint8Array(binaryString.length);
+ for (let i = 0; i < binaryString.length; i++) {
+ bytes[i] = binaryString.charCodeAt(i);
+ }
+ return new TextDecoder("utf-8").decode(bytes);
 }
 
 /**
@@ -487,6 +495,13 @@ export function stripQuotedReply(
 ): string {
  if (!content) return content;
 
+ // Forwarded messages: the forwarded email IS the content the user wants to
+ // read. Gmail/Apple Mail wrap a forward in the same quote container Gmail uses
+ // for reply quotes, so the reply-stripping below would delete the whole body
+ // and leave an empty note. Keep the content as-is when it's a forward whose
+ // marker precedes any reply boundary.
+ if (isForwardedMessage(content)) return content;
+
  if (contentType === "html") {
  // Gmail wraps quoted replies in <div class="gmail_quote">
  // Remove it and everything after it
@@ -573,19 +588,28 @@ export function stripQuotedReply(
  .trim();
  }
  }
-
- // Forwarded message separator
- if (line === "---------- Forwarded message ----------") {
- return lines
- .slice(0, i)
- .join("\n")
- .trim();
- }
  }
 
  return content;
 }
 
+/**
+ * Detects a forwarded message so {@link stripQuotedReply} can preserve it.
+ * Matches Gmail's dashed "---------- Forwarded message ---------" marker and
+ * Apple Mail's "Begin forwarded message:". Returns false when a reply boundary
+ * ("On … wrote:") precedes the forward marker — that's a reply quoting a
+ * forward, which the reply-stripper should still trim.
+ */
+function isForwardedMessage(content: string): boolean {
+ const fwdIdx = content.search(
+ /(-{2,}\s*Forwarded message\s*-{2,}|Begin forwarded message:)/i
+ );
+ if (fwdIdx === -1) return false;
+ const replyIdx = content.search(/On\s[\s\S]{0,200}?\swrote:/i);
+ if (replyIdx !== -1 && replyIdx < fwdIdx) return false;
+ return true;
+}
+
 /**
  * Recursively collects attachment parts from a Gmail message payload.
  * An attachment part has a non-empty filename and a body.attachmentId.

diff --git a/connectors/gmail/src/gmail-api.test.ts b/connectors/gmail/src/gmail-api.test.ts
@@ -0,0 +1,173 @@
+import { describe, expect, it } from "vitest";
+import {
+ stripQuotedReply,
+ transformGmailThread,
+ type GmailMessage,
+ type GmailMessagePart,
+ type GmailThread,
+} from "./gmail-api";
+
+// Gmail API returns part bodies as base64url. Encode fixtures the same way the
+// real API does so `extractBody`'s atob/replace decode path is exercised.
+function b64url(s: string): string {
+ return Buffer.from(s, "utf8")
+ .toString("base64")
+ .replace(/\+/g, "-")
+ .replace(/\//g, "_");
+}
+
+function part(
+ mimeType: string,
+ opts: {
+ data?: string;
+ parts?: GmailMessagePart[];
+ headers?: Array<[string, string]>;
+ filename?: string;
+ } = {}
+): GmailMessagePart {
+ return {
+ mimeType,
+ filename: opts.filename,
+ headers: (opts.headers ?? []).map(([name, value]) => ({ name, value })),
+ body:
+ opts.data !== undefined
+ ? { size: opts.data.length, data: b64url(opts.data) }
+ : undefined,
+ parts: opts.parts,
+ };
+}
+
+function thread(opts: {
+ from: string;
+ to?: string;
+ subject?: string;
+ snippet?: string;
+ payload: GmailMessagePart;
+}): GmailThread {
+ const headers = [
+ { name: "From", value: opts.from },
+ ...(opts.to ? [{ name: "To", value: opts.to }] : []),
+ ...(opts.subject ? [{ name: "Subject", value: opts.subject }] : []),
+ ];
+ const message: GmailMessage = {
+ id: "msg-1",
+ threadId: "thread-1",
+ labelIds: ["INBOX"],
+ snippet: opts.snippet ?? "snippet-without-body-marker",
+ historyId: "1",
+ internalDate: "1700000000000",
+ payload: { ...opts.payload, headers: [...headers, ...opts.payload.headers] },
+ sizeEstimate: 1000,
+ };
+ return { id: "thread-1", historyId: "1", messages: [message] };
+}
+
+function firstNoteContent(t: GmailThread): string {
+ const result = transformGmailThread(t);
+ return result.notes?.[0]?.content ?? "";
+}
+
+describe("forwarded email body extraction", () => {
+ it("keeps the body of an inline HTML forward (Gmail wraps it in gmail_quote)", () => {
+ // Gmail's "Forward" composes the original inside <div class="gmail_quote">,
+ // the SAME wrapper it uses for reply quotes — so the reply-stripper wrongly
+ // deletes the forwarded content, leaving an empty note.
+ const html =
+ '<div dir="ltr"><br>' +
+ '<div class="gmail_quote gmail_quote_container">' +
+ '<div dir="ltr" class="gmail_attr">---------- Forwarded message ---------<br>' +
+ "From: <strong>Porter Airlines</strong> &lt;flyporter@notifications.flyporter.com&gt;<br>" +
+ "Date: Wed, Aug 19, 2026<br>Subject: Booking details<br>To: Kris<br></div><br>" +
+ "<div>Your booking is confirmed. Confirmation code: BOOKINGCONFIRM123. Gate at YYZ.</div>" +
+ "</div></div>";
+ const t = thread({
+ from: "Forwarder <fwd@example.com>",
+ to: "kris@plot.day",
+ subject: "Fwd: Booking details",
+ payload: part("multipart/alternative", {
+ parts: [
+ part("text/plain", {
+ data:
+ "---------- Forwarded message ---------\r\nFrom: Porter Airlines\r\n\r\n" +
+ "Your booking is confirmed. Confirmation code: BOOKINGCONFIRM123.",
+ }),
+ part("text/html", { data: html }),
+ ],
+ }),
+ });
+ expect(firstNoteContent(t)).toContain("BOOKINGCONFIRM123");
+ });
+
+ it("keeps the body of a plain-text forward", () => {
+ const t = thread({
+ from: "Forwarder <fwd@example.com>",
+ to: "kris@plot.day",
+ subject: "Fwd: Booking details",
+ // Exact 10/10-dash separator that the strip path matches literally.
+ payload: part("text/plain", {
+ data:
+ "---------- Forwarded message ----------\r\n" +
+ "From: Porter Airlines\r\nSubject: Booking details\r\n\r\n" +
+ "Your booking is confirmed. Confirmation code: PLAINFWD456.",
+ }),
+ });
+ expect(firstNoteContent(t)).toContain("PLAINFWD456");
+ });
+
+ it("keeps the body of a forward attached as message/rfc822", () => {
+ const t = thread({
+ from: "Forwarder <fwd@example.com>",
+ to: "kris@plot.day",
+ subject: "Fwd: Booking details",
+ payload: part("multipart/mixed", {
+ parts: [
+ part("text/plain", { data: "" }), // forwarder added no note
+ part("message/rfc822", {
+ parts: [
+ part("multipart/alternative", {
+ parts: [
+ part("text/plain", {
+ data:
+ "Your booking is confirmed. Confirmation code: RFC822FWD789.",
+ }),
+ part("text/html", {
+ data:
+ "<div>Your booking is confirmed. Confirmation code: RFC822FWD789.</div>",
+ }),
+ ],
+ }),
+ ],
+ }),
+ ],
+ }),
+ });
+ expect(firstNoteContent(t)).toContain("RFC822FWD789");
+ });
+
+ it("still strips quoted replies (regression guard — HTML)", () => {
+ const html =
+ '<div dir="ltr">Thanks, that works for me!' +
+ '<div class="gmail_quote">' +
+ '<div dir="ltr" class="gmail_attr">On Mon, Jun 1, 2026 at 9:00 AM Bob &lt;bob@example.com&gt; wrote:<br></div>' +
+ '<blockquote class="gmail_quote">SECRETQUOTEDREPLY must be stripped</blockquote>' +
+ "</div></div>";
+ const t = thread({
+ from: "Bob <bob@example.com>",
+ to: "kris@plot.day",
+ subject: "Re: lunch",
+ payload: part("text/html", { data: html }),
+ });
+ const content = firstNoteContent(t);
+ expect(content).toContain("Thanks, that works for me!");
+ expect(content).not.toContain("SECRETQUOTEDREPLY");
+ });
+
+ it("still strips quoted replies (regression guard — plain text)", () => {
+ const reply = stripQuotedReply(
+ "My answer is yes.\r\nOn Mon, Jun 1, 2026, Bob wrote:\r\n> old message text",
+ "text"
+ );
+ expect(reply).toContain("My answer is yes.");
+ expect(reply).not.toContain("old message text");
+ });
+});
diff --git a/connectors/gmail/src/gmail-api.ts b/connectors/gmail/src/gmail-api.ts
@@ -416,39 +416,47 @@ export function getHeader(message: GmailMessage, name: string): string | null {
  * Returns raw content with its type so HTML can be converted server-side.
  */
 function extractBody(part: GmailMessagePart): { content: string; contentType: "text" | "html" } {
- // If this part has a body with data, return it
- if (part.body?.data) {
- // Gmail API returns base64url-encoded data — decode as UTF-8
- const binaryString = atob(part.body.data.replace(/-/g, "+").replace(/_/g, "/"));
- const bytes = new Uint8Array(binaryString.length);
- for (let i = 0; i < binaryString.length; i++) {
- bytes[i] = binaryString.charCodeAt(i);
- }
- const decoded = new TextDecoder("utf-8").decode(bytes);
- const contentType = part.mimeType === "text/html" ? "html" as const : "text" as const;
- return { content: decoded, contentType };
- }
+ // Prefer HTML over plain text — server-side conversion produces cleaner output.
+ // Search the WHOLE MIME tree, not just immediate children: forwarded messages
+ // nest the real body inside a `message/rfc822` part (or a deeper multipart),
+ // which the old immediate-children-only `find` missed, yielding an empty note.
+ const html = findPartContent(part, "text/html");
+ if (html) return { content: html, contentType: "html" };
 
- // If multipart, recursively search parts
- if (part.parts) {
- // Prefer HTML over plain text — server-side conversion produces cleaner output
- const htmlPart = part.parts.find((p) => p.mimeType === "text/html");
- if (htmlPart) {
- return extractBody(htmlPart);
- }
+ const text = findPartContent(part, "text/plain");
+ if (text) return { content: text, contentType: "text" };
 
- const textPart = part.parts.find((p) => p.mimeType === "text/plain");
- if (textPart) {
- return extractBody(textPart);
- }
+ return { content: "", contentType: "text" };
+}
 
- // Try first part as fallback
- if (part.parts.length > 0) {
- return extractBody(part.parts[0]);
+/**
+ * Recursively finds the first non-empty body of the given MIME type in a Gmail
+ * payload tree. Descends through multipart/* containers AND `message/rfc822`
+ * parts (a forwarded email attached inline carries its original payload there).
+ * Skips real attachments, whose bodies are binary and fetched separately.
+ */
+function findPartContent(part: GmailMessagePart, mimeType: string): string | null {
+ const isAttachment = !!part.filename && !!part.body?.attachmentId;
+ if (!isAttachment && part.mimeType === mimeType && part.body?.data) {
+ return decodeBase64Url(part.body.data);
+ }
+ if (part.parts) {
+ for (const child of part.parts) {
+ const found = findPartContent(child, mimeType);
+ if (found) return found;
  }
  }
+ return null;
+}
 
- return { content: "", contentType: "text" };
+/** Decodes Gmail's base64url-encoded part data as UTF-8. */
+function decodeBase64Url(data: string): string {
+ const binaryString = atob(data.replace(/-/g, "+").replace(/_/g, "/"));
+ const bytes = new Uint8Array(binaryString.length);
+ for (let i = 0; i < binaryString.length; i++) {
+ bytes[i] = binaryString.charCodeAt(i);
+ }
+ return new TextDecoder("utf-8").decode(bytes);
 }
 
 /**
@@ -487,6 +495,13 @@ export function stripQuotedReply(
 ): string {
  if (!content) return content;
 
+ // Forwarded messages: the forwarded email IS the content the user wants to
+ // read. Gmail/Apple Mail wrap a forward in the same quote container Gmail uses
+ // for reply quotes, so the reply-stripping below would delete the whole body
+ // and leave an empty note. Keep the content as-is when it's a forward whose
+ // marker precedes any reply boundary.
+ if (isForwardedMessage(content)) return content;
+
  if (contentType === "html") {
  // Gmail wraps quoted replies in <div class="gmail_quote">
  // Remove it and everything after it
@@ -573,19 +588,28 @@ export function stripQuotedReply(
  .trim();
  }
  }
-
- // Forwarded message separator
- if (line === "---------- Forwarded message ----------") {
- return lines
- .slice(0, i)
- .join("\n")
- .trim();
- }
  }
 
  return content;
 }
 
+/**
+ * Detects a forwarded message so {@link stripQuotedReply} can preserve it.
+ * Matches Gmail's dashed "---------- Forwarded message ---------" marker and
+ * Apple Mail's "Begin forwarded message:". Returns false when a reply boundary
+ * ("On … wrote:") precedes the forward marker — that's a reply quoting a
+ * forward, which the reply-stripper should still trim.
+ */
+function isForwardedMessage(content: string): boolean {
+ const fwdIdx = content.search(
+ /(-{2,}\s*Forwarded message\s*-{2,}|Begin forwarded message:)/i
+ );
+ if (fwdIdx === -1) return false;
+ const replyIdx = content.search(/On\s[\s\S]{0,200}?\swrote:/i);
+ if (replyIdx !== -1 && replyIdx < fwdIdx) return false;
+ return true;
+}
+
 /**
  * Recursively collects attachment parts from a Gmail message payload.
  * An attachment part has a non-empty filename and a body.attachmentId.

diff --git a/connectors/gmail/src/gmail-api.test.ts b/connectors/gmail/src/gmail-api.test.ts
@@ -0,0 +1,173 @@
+import { describe, expect, it } from "vitest";
+import {
+ stripQuotedReply,
+ transformGmailThread,
+ type GmailMessage,
+ type GmailMessagePart,
+ type GmailThread,
+} from "./gmail-api";
+
+// Gmail API returns part bodies as base64url. Encode fixtures the same way the
+// real API does so `extractBody`'s atob/replace decode path is exercised.
+function b64url(s: string): string {
+ return Buffer.from(s, "utf8")
+ .toString("base64")
+ .replace(/\+/g, "-")
+ .replace(/\//g, "_");
+}
+
+function part(
+ mimeType: string,
+ opts: {
+ data?: string;
+ parts?: GmailMessagePart[];
+ headers?: Array<[string, string]>;
+ filename?: string;
+ } = {}
+): GmailMessagePart {
+ return {
+ mimeType,
+ filename: opts.filename,
+ headers: (opts.headers ?? []).map(([name, value]) => ({ name, value })),
+ body:
+ opts.data !== undefined
+ ? { size: opts.data.length, data: b64url(opts.data) }
+ : undefined,
+ parts: opts.parts,
+ };
+}
+
+function thread(opts: {
+ from: string;
+ to?: string;
+ subject?: string;
+ snippet?: string;
+ payload: GmailMessagePart;
+}): GmailThread {
+ const headers = [
+ { name: "From", value: opts.from },
+ ...(opts.to ? [{ name: "To", value: opts.to }] : []),
+ ...(opts.subject ? [{ name: "Subject", value: opts.subject }] : []),
+ ];
+ const message: GmailMessage = {
+ id: "msg-1",
+ threadId: "thread-1",
+ labelIds: ["INBOX"],
+ snippet: opts.snippet ?? "snippet-without-body-marker",
+ historyId: "1",
+ internalDate: "1700000000000",
+ payload: { ...opts.payload, headers: [...headers, ...opts.payload.headers] },
+ sizeEstimate: 1000,
+ };
+ return { id: "thread-1", historyId: "1", messages: [message] };
+}
+
+function firstNoteContent(t: GmailThread): string {
+ const result = transformGmailThread(t);
+ return result.notes?.[0]?.content ?? "";
+}
+
+describe("forwarded email body extraction", () => {
+ it("keeps the body of an inline HTML forward (Gmail wraps it in gmail_quote)", () => {
+ // Gmail's "Forward" composes the original inside <div class="gmail_quote">,
+ // the SAME wrapper it uses for reply quotes — so the reply-stripper wrongly
+ // deletes the forwarded content, leaving an empty note.
+ const html =
+ '<div dir="ltr"><br>' +
+ '<div class="gmail_quote gmail_quote_container">' +
+ '<div dir="ltr" class="gmail_attr">---------- Forwarded message ---------<br>' +
+ "From: <strong>Porter Airlines</strong> &lt;flyporter@notifications.flyporter.com&gt;<br>" +
+ "Date: Wed, Aug 19, 2026<br>Subject: Booking details<br>To: Kris<br></div><br>" +
+ "<div>Your booking is confirmed. Confirmation code: BOOKINGCONFIRM123. Gate at YYZ.</div>" +
+ "</div></div>";
+ const t = thread({
+ from: "Forwarder <fwd@example.com>",
+ to: "kris@plot.day",
+ subject: "Fwd: Booking details",
+ payload: part("multipart/alternative", {
+ parts: [
+ part("text/plain", {
+ data:
+ "---------- Forwarded message ---------\r\nFrom: Porter Airlines\r\n\r\n" +
+ "Your booking is confirmed. Confirmation code: BOOKINGCONFIRM123.",
+ }),
+ part("text/html", { data: html }),
+ ],
+ }),
+ });
+ expect(firstNoteContent(t)).toContain("BOOKINGCONFIRM123");
+ });
+
+ it("keeps the body of a plain-text forward", () => {
+ const t = thread({
+ from: "Forwarder <fwd@example.com>",
+ to: "kris@plot.day",
+ subject: "Fwd: Booking details",
+ // Exact 10/10-dash separator that the strip path matches literally.
+ payload: part("text/plain", {
+ data:
+ "---------- Forwarded message ----------\r\n" +
+ "From: Porter Airlines\r\nSubject: Booking details\r\n\r\n" +
+ "Your booking is confirmed. Confirmation code: PLAINFWD456.",
+ }),
+ });
+ expect(firstNoteContent(t)).toContain("PLAINFWD456");
+ });
+
+ it("keeps the body of a forward attached as message/rfc822", () => {
+ const t = thread({
+ from: "Forwarder <fwd@example.com>",
+ to: "kris@plot.day",
+ subject: "Fwd: Booking details",
+ payload: part("multipart/mixed", {
+ parts: [
+ part("text/plain", { data: "" }), // forwarder added no note
+ part("message/rfc822", {
+ parts: [
+ part("multipart/alternative", {
+ parts: [
+ part("text/plain", {
+ data:
+ "Your booking is confirmed. Confirmation code: RFC822FWD789.",
+ }),
+ part("text/html", {
+ data:
+ "<div>Your booking is confirmed. Confirmation code: RFC822FWD789.</div>",
+ }),
+ ],
+ }),
+ ],
+ }),
+ ],
+ }),
+ });
+ expect(firstNoteContent(t)).toContain("RFC822FWD789");
+ });
+
+ it("still strips quoted replies (regression guard — HTML)", () => {
+ const html =
+ '<div dir="ltr">Thanks, that works for me!' +
+ '<div class="gmail_quote">' +
+ '<div dir="ltr" class="gmail_attr">On Mon, Jun 1, 2026 at 9:00 AM Bob &lt;bob@example.com&gt; wrote:<br></div>' +
+ '<blockquote class="gmail_quote">SECRETQUOTEDREPLY must be stripped</blockquote>' +
+ "</div></div>";
+ const t = thread({
+ from: "Bob <bob@example.com>",
+ to: "kris@plot.day",
+ subject: "Re: lunch",
+ payload: part("text/html", { data: html }),
+ });
+ const content = firstNoteContent(t);
+ expect(content).toContain("Thanks, that works for me!");
+ expect(content).not.toContain("SECRETQUOTEDREPLY");
+ });
+
+ it("still strips quoted replies (regression guard — plain text)", () => {
+ const reply = stripQuotedReply(
+ "My answer is yes.\r\nOn Mon, Jun 1, 2026, Bob wrote:\r\n> old message text",
+ "text"
+ );
+ expect(reply).toContain("My answer is yes.");
+ expect(reply).not.toContain("old message text");
+ });
+});
diff --git a/connectors/gmail/src/gmail-api.ts b/connectors/gmail/src/gmail-api.ts
@@ -416,39 +416,47 @@ export function getHeader(message: GmailMessage, name: string): string | null {
  * Returns raw content with its type so HTML can be converted server-side.
  */
 function extractBody(part: GmailMessagePart): { content: string; contentType: "text" | "html" } {
- // If this part has a body with data, return it
- if (part.body?.data) {
- // Gmail API returns base64url-encoded data — decode as UTF-8
- const binaryString = atob(part.body.data.replace(/-/g, "+").replace(/_/g, "/"));
- const bytes = new Uint8Array(binaryString.length);
- for (let i = 0; i < binaryString.length; i++) {
- bytes[i] = binaryString.charCodeAt(i);
- }
- const decoded = new TextDecoder("utf-8").decode(bytes);
- const contentType = part.mimeType === "text/html" ? "html" as const : "text" as const;
- return { content: decoded, contentType };
- }
+ // Prefer HTML over plain text — server-side conversion produces cleaner output.
+ // Search the WHOLE MIME tree, not just immediate children: forwarded messages
+ // nest the real body inside a `message/rfc822` part (or a deeper multipart),
+ // which the old immediate-children-only `find` missed, yielding an empty note.
+ const html = findPartContent(part, "text/html");
+ if (html) return { content: html, contentType: "html" };
 
- // If multipart, recursively search parts
- if (part.parts) {
- // Prefer HTML over plain text — server-side conversion produces cleaner output
- const htmlPart = part.parts.find((p) => p.mimeType === "text/html");
- if (htmlPart) {
- return extractBody(htmlPart);
- }
+ const text = findPartContent(part, "text/plain");
+ if (text) return { content: text, contentType: "text" };
 
- const textPart = part.parts.find((p) => p.mimeType === "text/plain");
- if (textPart) {
- return extractBody(textPart);
- }
+ return { content: "", contentType: "text" };
+}
 
- // Try first part as fallback
- if (part.parts.length > 0) {
- return extractBody(part.parts[0]);
+/**
+ * Recursively finds the first non-empty body of the given MIME type in a Gmail
+ * payload tree. Descends through multipart/* containers AND `message/rfc822`
+ * parts (a forwarded email attached inline carries its original payload there).
+ * Skips real attachments, whose bodies are binary and fetched separately.
+ */
+function findPartContent(part: GmailMessagePart, mimeType: string): string | null {
+ const isAttachment = !!part.filename && !!part.body?.attachmentId;
+ if (!isAttachment && part.mimeType === mimeType && part.body?.data) {
+ return decodeBase64Url(part.body.data);
+ }
+ if (part.parts) {
+ for (const child of part.parts) {
+ const found = findPartContent(child, mimeType);
+ if (found) return found;
  }
  }
+ return null;
+}
 
- return { content: "", contentType: "text" };
+/** Decodes Gmail's base64url-encoded part data as UTF-8. */
+function decodeBase64Url(data: string): string {
+ const binaryString = atob(data.replace(/-/g, "+").replace(/_/g, "/"));
+ const bytes = new Uint8Array(binaryString.length);
+ for (let i = 0; i < binaryString.length; i++) {
+ bytes[i] = binaryString.charCodeAt(i);
+ }
+ return new TextDecoder("utf-8").decode(bytes);
 }
 
 /**
@@ -487,6 +495,13 @@ export function stripQuotedReply(
 ): string {
  if (!content) return content;
 
+ // Forwarded messages: the forwarded email IS the content the user wants to
+ // read. Gmail/Apple Mail wrap a forward in the same quote container Gmail uses
+ // for reply quotes, so the reply-stripping below would delete the whole body
+ // and leave an empty note. Keep the content as-is when it's a forward whose
+ // marker precedes any reply boundary.
+ if (isForwardedMessage(content)) return content;
+
  if (contentType === "html") {
  // Gmail wraps quoted replies in <div class="gmail_quote">
  // Remove it and everything after it
@@ -573,19 +588,28 @@ export function stripQuotedReply(
  .trim();
  }
  }
-
- // Forwarded message separator
- if (line === "---------- Forwarded message ----------") {
- return lines
- .slice(0, i)
- .join("\n")
- .trim();
- }
  }
 
  return content;
 }
 
+/**
+ * Detects a forwarded message so {@link stripQuotedReply} can preserve it.
+ * Matches Gmail's dashed "---------- Forwarded message ---------" marker and
+ * Apple Mail's "Begin forwarded message:". Returns false when a reply boundary
+ * ("On … wrote:") precedes the forward marker — that's a reply quoting a
+ * forward, which the reply-stripper should still trim.
+ */
+function isForwardedMessage(content: string): boolean {
+ const fwdIdx = content.search(
+ /(-{2,}\s*Forwarded message\s*-{2,}|Begin forwarded message:)/i
+ );
+ if (fwdIdx === -1) return false;
+ const replyIdx = content.search(/On\s[\s\S]{0,200}?\swrote:/i);
+ if (replyIdx !== -1 && replyIdx < fwdIdx) return false;
+ return true;
+}
+
 /**
  * Recursively collects attachment parts from a Gmail message payload.
  * An attachment part has a non-empty filename and a body.attachmentId.

diff --git a/connectors/gmail/src/gmail-api.test.ts b/connectors/gmail/src/gmail-api.test.ts
@@ -0,0 +1,173 @@
+import { describe, expect, it } from "vitest";
+import {
+ stripQuotedReply,
+ transformGmailThread,
+ type GmailMessage,
+ type GmailMessagePart,
+ type GmailThread,
+} from "./gmail-api";
+
+// Gmail API returns part bodies as base64url. Encode fixtures the same way the
+// real API does so `extractBody`'s atob/replace decode path is exercised.
+function b64url(s: string): string {
+ return Buffer.from(s, "utf8")
+ .toString("base64")
+ .replace(/\+/g, "-")
+ .replace(/\//g, "_");
+}
+
+function part(
+ mimeType: string,
+ opts: {
+ data?: string;
+ parts?: GmailMessagePart[];
+ headers?: Array<[string, string]>;
+ filename?: string;
+ } = {}
+): GmailMessagePart {
+ return {
+ mimeType,
+ filename: opts.filename,
+ headers: (opts.headers ?? []).map(([name, value]) => ({ name, value })),
+ body:
+ opts.data !== undefined
+ ? { size: opts.data.length, data: b64url(opts.data) }
+ : undefined,
+ parts: opts.parts,
+ };
+}
+
+function thread(opts: {
+ from: string;
+ to?: string;
+ subject?: string;
+ snippet?: string;
+ payload: GmailMessagePart;
+}): GmailThread {
+ const headers = [
+ { name: "From", value: opts.from },
+ ...(opts.to ? [{ name: "To", value: opts.to }] : []),
+ ...(opts.subject ? [{ name: "Subject", value: opts.subject }] : []),
+ ];
+ const message: GmailMessage = {
+ id: "msg-1",
+ threadId: "thread-1",
+ labelIds: ["INBOX"],
+ snippet: opts.snippet ?? "snippet-without-body-marker",
+ historyId: "1",
+ internalDate: "1700000000000",
+ payload: { ...opts.payload, headers: [...headers, ...opts.payload.headers] },
+ sizeEstimate: 1000,
+ };
+ return { id: "thread-1", historyId: "1", messages: [message] };
+}
+
+function firstNoteContent(t: GmailThread): string {
+ const result = transformGmailThread(t);
+ return result.notes?.[0]?.content ?? "";
+}
+
+describe("forwarded email body extraction", () => {
+ it("keeps the body of an inline HTML forward (Gmail wraps it in gmail_quote)", () => {
+ // Gmail's "Forward" composes the original inside <div class="gmail_quote">,
+ // the SAME wrapper it uses for reply quotes — so the reply-stripper wrongly
+ // deletes the forwarded content, leaving an empty note.
+ const html =
+ '<div dir="ltr"><br>' +
+ '<div class="gmail_quote gmail_quote_container">' +
+ '<div dir="ltr" class="gmail_attr">---------- Forwarded message ---------<br>' +
+ "From: <strong>Porter Airlines</strong> &lt;flyporter@notifications.flyporter.com&gt;<br>" +
+ "Date: Wed, Aug 19, 2026<br>Subject: Booking details<br>To: Kris<br></div><br>" +
+ "<div>Your booking is confirmed. Confirmation code: BOOKINGCONFIRM123. Gate at YYZ.</div>" +
+ "</div></div>";
+ const t = thread({
+ from: "Forwarder <fwd@example.com>",
+ to: "kris@plot.day",
+ subject: "Fwd: Booking details",
+ payload: part("multipart/alternative", {
+ parts: [
+ part("text/plain", {
+ data:
+ "---------- Forwarded message ---------\r\nFrom: Porter Airlines\r\n\r\n" +
+ "Your booking is confirmed. Confirmation code: BOOKINGCONFIRM123.",
+ }),
+ part("text/html", { data: html }),
+ ],
+ }),
+ });
+ expect(firstNoteContent(t)).toContain("BOOKINGCONFIRM123");
+ });
+
+ it("keeps the body of a plain-text forward", () => {
+ const t = thread({
+ from: "Forwarder <fwd@example.com>",
+ to: "kris@plot.day",
+ subject: "Fwd: Booking details",
+ // Exact 10/10-dash separator that the strip path matches literally.
+ payload: part("text/plain", {
+ data:
+ "---------- Forwarded message ----------\r\n" +
+ "From: Porter Airlines\r\nSubject: Booking details\r\n\r\n" +
+ "Your booking is confirmed. Confirmation code: PLAINFWD456.",
+ }),
+ });
+ expect(firstNoteContent(t)).toContain("PLAINFWD456");
+ });
+
+ it("keeps the body of a forward attached as message/rfc822", () => {
+ const t = thread({
+ from: "Forwarder <fwd@example.com>",
+ to: "kris@plot.day",
+ subject: "Fwd: Booking details",
+ payload: part("multipart/mixed", {
+ parts: [
+ part("text/plain", { data: "" }), // forwarder added no note
+ part("message/rfc822", {
+ parts: [
+ part("multipart/alternative", {
+ parts: [
+ part("text/plain", {
+ data:
+ "Your booking is confirmed. Confirmation code: RFC822FWD789.",
+ }),
+ part("text/html", {
+ data:
+ "<div>Your booking is confirmed. Confirmation code: RFC822FWD789.</div>",
+ }),
+ ],
+ }),
+ ],
+ }),
+ ],
+ }),
+ });
+ expect(firstNoteContent(t)).toContain("RFC822FWD789");
+ });
+
+ it("still strips quoted replies (regression guard — HTML)", () => {
+ const html =
+ '<div dir="ltr">Thanks, that works for me!' +
+ '<div class="gmail_quote">' +
+ '<div dir="ltr" class="gmail_attr">On Mon, Jun 1, 2026 at 9:00 AM Bob &lt;bob@example.com&gt; wrote:<br></div>' +
+ '<blockquote class="gmail_quote">SECRETQUOTEDREPLY must be stripped</blockquote>' +
+ "</div></div>";
+ const t = thread({
+ from: "Bob <bob@example.com>",
+ to: "kris@plot.day",
+ subject: "Re: lunch",
+ payload: part("text/html", { data: html }),
+ });
+ const content = firstNoteContent(t);
+ expect(content).toContain("Thanks, that works for me!");
+ expect(content).not.toContain("SECRETQUOTEDREPLY");
+ });
+
+ it("still strips quoted replies (regression guard — plain text)", () => {
+ const reply = stripQuotedReply(
+ "My answer is yes.\r\nOn Mon, Jun 1, 2026, Bob wrote:\r\n> old message text",
+ "text"
+ );
+ expect(reply).toContain("My answer is yes.");
+ expect(reply).not.toContain("old message text");
+ });
+});
diff --git a/connectors/gmail/src/gmail-api.ts b/connectors/gmail/src/gmail-api.ts
@@ -416,39 +416,47 @@ export function getHeader(message: GmailMessage, name: string): string | null {
  * Returns raw content with its type so HTML can be converted server-side.
  */
 function extractBody(part: GmailMessagePart): { content: string; contentType: "text" | "html" } {
- // If this part has a body with data, return it
- if (part.body?.data) {
- // Gmail API returns base64url-encoded data — decode as UTF-8
- const binaryString = atob(part.body.data.replace(/-/g, "+").replace(/_/g, "/"));
- const bytes = new Uint8Array(binaryString.length);
- for (let i = 0; i < binaryString.length; i++) {
- bytes[i] = binaryString.charCodeAt(i);
- }
- const decoded = new TextDecoder("utf-8").decode(bytes);
- const contentType = part.mimeType === "text/html" ? "html" as const : "text" as const;
- return { content: decoded, contentType };
- }
+ // Prefer HTML over plain text — server-side conversion produces cleaner output.
+ // Search the WHOLE MIME tree, not just immediate children: forwarded messages
+ // nest the real body inside a `message/rfc822` part (or a deeper multipart),
+ // which the old immediate-children-only `find` missed, yielding an empty note.
+ const html = findPartContent(part, "text/html");
+ if (html) return { content: html, contentType: "html" };
 
- // If multipart, recursively search parts
- if (part.parts) {
- // Prefer HTML over plain text — server-side conversion produces cleaner output
- const htmlPart = part.parts.find((p) => p.mimeType === "text/html");
- if (htmlPart) {
- return extractBody(htmlPart);
- }
+ const text = findPartContent(part, "text/plain");
+ if (text) return { content: text, contentType: "text" };
 
- const textPart = part.parts.find((p) => p.mimeType === "text/plain");
- if (textPart) {
- return extractBody(textPart);
- }
+ return { content: "", contentType: "text" };
+}
 
- // Try first part as fallback
- if (part.parts.length > 0) {
- return extractBody(part.parts[0]);
+/**
+ * Recursively finds the first non-empty body of the given MIME type in a Gmail
+ * payload tree. Descends through multipart/* containers AND `message/rfc822`
+ * parts (a forwarded email attached inline carries its original payload there).
+ * Skips real attachments, whose bodies are binary and fetched separately.
+ */
+function findPartContent(part: GmailMessagePart, mimeType: string): string | null {
+ const isAttachment = !!part.filename && !!part.body?.attachmentId;
+ if (!isAttachment && part.mimeType === mimeType && part.body?.data) {
+ return decodeBase64Url(part.body.data);
+ }
+ if (part.parts) {
+ for (const child of part.parts) {
+ const found = findPartContent(child, mimeType);
+ if (found) return found;
  }
  }
+ return null;
+}
 
- return { content: "", contentType: "text" };
+/** Decodes Gmail's base64url-encoded part data as UTF-8. */
+function decodeBase64Url(data: string): string {
+ const binaryString = atob(data.replace(/-/g, "+").replace(/_/g, "/"));
+ const bytes = new Uint8Array(binaryString.length);
+ for (let i = 0; i < binaryString.length; i++) {
+ bytes[i] = binaryString.charCodeAt(i);
+ }
+ return new TextDecoder("utf-8").decode(bytes);
 }
 
 /**
@@ -487,6 +495,13 @@ export function stripQuotedReply(
 ): string {
  if (!content) return content;
 
+ // Forwarded messages: the forwarded email IS the content the user wants to
+ // read. Gmail/Apple Mail wrap a forward in the same quote container Gmail uses
+ // for reply quotes, so the reply-stripping below would delete the whole body
+ // and leave an empty note. Keep the content as-is when it's a forward whose
+ // marker precedes any reply boundary.
+ if (isForwardedMessage(content)) return content;
+
  if (contentType === "html") {
  // Gmail wraps quoted replies in <div class="gmail_quote">
  // Remove it and everything after it
@@ -573,19 +588,28 @@ export function stripQuotedReply(
  .trim();
  }
  }
-
- // Forwarded message separator
- if (line === "---------- Forwarded message ----------") {
- return lines
- .slice(0, i)
- .join("\n")
- .trim();
- }
  }
 
  return content;
 }
 
+/**
+ * Detects a forwarded message so {@link stripQuotedReply} can preserve it.
+ * Matches Gmail's dashed "---------- Forwarded message ---------" marker and
+ * Apple Mail's "Begin forwarded message:". Returns false when a reply boundary
+ * ("On … wrote:") precedes the forward marker — that's a reply quoting a
+ * forward, which the reply-stripper should still trim.
+ */
+function isForwardedMessage(content: string): boolean {
+ const fwdIdx = content.search(
+ /(-{2,}\s*Forwarded message\s*-{2,}|Begin forwarded message:)/i
+ );
+ if (fwdIdx === -1) return false;
+ const replyIdx = content.search(/On\s[\s\S]{0,200}?\swrote:/i);
+ if (replyIdx !== -1 && replyIdx < fwdIdx) return false;
+ return true;
+}
+
 /**
  * Recursively collects attachment parts from a Gmail message payload.
  * An attachment part has a non-empty filename and a body.attachmentId.

diff --git a/connectors/gmail/src/gmail-api.test.ts b/connectors/gmail/src/gmail-api.test.ts
@@ -0,0 +1,173 @@
+import { describe, expect, it } from "vitest";
+import {
+ stripQuotedReply,
+ transformGmailThread,
+ type GmailMessage,
+ type GmailMessagePart,
+ type GmailThread,
+} from "./gmail-api";
+
+// Gmail API returns part bodies as base64url. Encode fixtures the same way the
+// real API does so `extractBody`'s atob/replace decode path is exercised.
+function b64url(s: string): string {
+ return Buffer.from(s, "utf8")
+ .toString("base64")
+ .replace(/\+/g, "-")
+ .replace(/\//g, "_");
+}
+
+function part(
+ mimeType: string,
+ opts: {
+ data?: string;
+ parts?: GmailMessagePart[];
+ headers?: Array<[string, string]>;
+ filename?: string;
+ } = {}
+): GmailMessagePart {
+ return {
+ mimeType,
+ filename: opts.filename,
+ headers: (opts.headers ?? []).map(([name, value]) => ({ name, value })),
+ body:
+ opts.data !== undefined
+ ? { size: opts.data.length, data: b64url(opts.data) }
+ : undefined,
+ parts: opts.parts,
+ };
+}
+
+function thread(opts: {
+ from: string;
+ to?: string;
+ subject?: string;
+ snippet?: string;
+ payload: GmailMessagePart;
+}): GmailThread {
+ const headers = [
+ { name: "From", value: opts.from },
+ ...(opts.to ? [{ name: "To", value: opts.to }] : []),
+ ...(opts.subject ? [{ name: "Subject", value: opts.subject }] : []),
+ ];
+ const message: GmailMessage = {
+ id: "msg-1",
+ threadId: "thread-1",
+ labelIds: ["INBOX"],
+ snippet: opts.snippet ?? "snippet-without-body-marker",
+ historyId: "1",
+ internalDate: "1700000000000",
+ payload: { ...opts.payload, headers: [...headers, ...opts.payload.headers] },
+ sizeEstimate: 1000,
+ };
+ return { id: "thread-1", historyId: "1", messages: [message] };
+}
+
+function firstNoteContent(t: GmailThread): string {
+ const result = transformGmailThread(t);
+ return result.notes?.[0]?.content ?? "";
+}
+
+describe("forwarded email body extraction", () => {
+ it("keeps the body of an inline HTML forward (Gmail wraps it in gmail_quote)", () => {
+ // Gmail's "Forward" composes the original inside <div class="gmail_quote">,
+ // the SAME wrapper it uses for reply quotes — so the reply-stripper wrongly
+ // deletes the forwarded content, leaving an empty note.
+ const html =
+ '<div dir="ltr"><br>' +
+ '<div class="gmail_quote gmail_quote_container">' +
+ '<div dir="ltr" class="gmail_attr">---------- Forwarded message ---------<br>' +
+ "From: <strong>Porter Airlines</strong> &lt;flyporter@notifications.flyporter.com&gt;<br>" +
+ "Date: Wed, Aug 19, 2026<br>Subject: Booking details<br>To: Kris<br></div><br>" +
+ "<div>Your booking is confirmed. Confirmation code: BOOKINGCONFIRM123. Gate at YYZ.</div>" +
+ "</div></div>";
+ const t = thread({
+ from: "Forwarder <fwd@example.com>",
+ to: "kris@plot.day",
+ subject: "Fwd: Booking details",
+ payload: part("multipart/alternative", {
+ parts: [
+ part("text/plain", {
+ data:
+ "---------- Forwarded message ---------\r\nFrom: Porter Airlines\r\n\r\n" +
+ "Your booking is confirmed. Confirmation code: BOOKINGCONFIRM123.",
+ }),
+ part("text/html", { data: html }),
+ ],
+ }),
+ });
+ expect(firstNoteContent(t)).toContain("BOOKINGCONFIRM123");
+ });
+
+ it("keeps the body of a plain-text forward", () => {
+ const t = thread({
+ from: "Forwarder <fwd@example.com>",
+ to: "kris@plot.day",
+ subject: "Fwd: Booking details",
+ // Exact 10/10-dash separator that the strip path matches literally.
+ payload: part("text/plain", {
+ data:
+ "---------- Forwarded message ----------\r\n" +
+ "From: Porter Airlines\r\nSubject: Booking details\r\n\r\n" +
+ "Your booking is confirmed. Confirmation code: PLAINFWD456.",
+ }),
+ });
+ expect(firstNoteContent(t)).toContain("PLAINFWD456");
+ });
+
+ it("keeps the body of a forward attached as message/rfc822", () => {
+ const t = thread({
+ from: "Forwarder <fwd@example.com>",
+ to: "kris@plot.day",
+ subject: "Fwd: Booking details",
+ payload: part("multipart/mixed", {
+ parts: [
+ part("text/plain", { data: "" }), // forwarder added no note
+ part("message/rfc822", {
+ parts: [
+ part("multipart/alternative", {
+ parts: [
+ part("text/plain", {
+ data:
+ "Your booking is confirmed. Confirmation code: RFC822FWD789.",
+ }),
+ part("text/html", {
+ data:
+ "<div>Your booking is confirmed. Confirmation code: RFC822FWD789.</div>",
+ }),
+ ],
+ }),
+ ],
+ }),
+ ],
+ }),
+ });
+ expect(firstNoteContent(t)).toContain("RFC822FWD789");
+ });
+
+ it("still strips quoted replies (regression guard — HTML)", () => {
+ const html =
+ '<div dir="ltr">Thanks, that works for me!' +
+ '<div class="gmail_quote">' +
+ '<div dir="ltr" class="gmail_attr">On Mon, Jun 1, 2026 at 9:00 AM Bob &lt;bob@example.com&gt; wrote:<br></div>' +
+ '<blockquote class="gmail_quote">SECRETQUOTEDREPLY must be stripped</blockquote>' +
+ "</div></div>";
+ const t = thread({
+ from: "Bob <bob@example.com>",
+ to: "kris@plot.day",
+ subject: "Re: lunch",
+ payload: part("text/html", { data: html }),
+ });
+ const content = firstNoteContent(t);
+ expect(content).toContain("Thanks, that works for me!");
+ expect(content).not.toContain("SECRETQUOTEDREPLY");
+ });
+
+ it("still strips quoted replies (regression guard — plain text)", () => {
+ const reply = stripQuotedReply(
+ "My answer is yes.\r\nOn Mon, Jun 1, 2026, Bob wrote:\r\n> old message text",
+ "text"
+ );
+ expect(reply).toContain("My answer is yes.");
+ expect(reply).not.toContain("old message text");
+ });
+});
diff --git a/connectors/gmail/src/gmail-api.ts b/connectors/gmail/src/gmail-api.ts
@@ -416,39 +416,47 @@ export function getHeader(message: GmailMessage, name: string): string | null {
  * Returns raw content with its type so HTML can be converted server-side.
  */
 function extractBody(part: GmailMessagePart): { content: string; contentType: "text" | "html" } {
- // If this part has a body with data, return it
- if (part.body?.data) {
- // Gmail API returns base64url-encoded data — decode as UTF-8
- const binaryString = atob(part.body.data.replace(/-/g, "+").replace(/_/g, "/"));
- const bytes = new Uint8Array(binaryString.length);
- for (let i = 0; i < binaryString.length; i++) {
- bytes[i] = binaryString.charCodeAt(i);
- }
- const decoded = new TextDecoder("utf-8").decode(bytes);
- const contentType = part.mimeType === "text/html" ? "html" as const : "text" as const;
- return { content: decoded, contentType };
- }
+ // Prefer HTML over plain text — server-side conversion produces cleaner output.
+ // Search the WHOLE MIME tree, not just immediate children: forwarded messages
+ // nest the real body inside a `message/rfc822` part (or a deeper multipart),
+ // which the old immediate-children-only `find` missed, yielding an empty note.
+ const html = findPartContent(part, "text/html");
+ if (html) return { content: html, contentType: "html" };
 
- // If multipart, recursively search parts
- if (part.parts) {
- // Prefer HTML over plain text — server-side conversion produces cleaner output
- const htmlPart = part.parts.find((p) => p.mimeType === "text/html");
- if (htmlPart) {
- return extractBody(htmlPart);
- }
+ const text = findPartContent(part, "text/plain");
+ if (text) return { content: text, contentType: "text" };
 
- const textPart = part.parts.find((p) => p.mimeType === "text/plain");
- if (textPart) {
- return extractBody(textPart);
- }
+ return { content: "", contentType: "text" };
+}
 
- // Try first part as fallback
- if (part.parts.length > 0) {
- return extractBody(part.parts[0]);
+/**
+ * Recursively finds the first non-empty body of the given MIME type in a Gmail
+ * payload tree. Descends through multipart/* containers AND `message/rfc822`
+ * parts (a forwarded email attached inline carries its original payload there).
+ * Skips real attachments, whose bodies are binary and fetched separately.
+ */
+function findPartContent(part: GmailMessagePart, mimeType: string): string | null {
+ const isAttachment = !!part.filename && !!part.body?.attachmentId;
+ if (!isAttachment && part.mimeType === mimeType && part.body?.data) {
+ return decodeBase64Url(part.body.data);
+ }
+ if (part.parts) {
+ for (const child of part.parts) {
+ const found = findPartContent(child, mimeType);
+ if (found) return found;
  }
  }
+ return null;
+}
 
- return { content: "", contentType: "text" };
+/** Decodes Gmail's base64url-encoded part data as UTF-8. */
+function decodeBase64Url(data: string): string {
+ const binaryString = atob(data.replace(/-/g, "+").replace(/_/g, "/"));
+ const bytes = new Uint8Array(binaryString.length);
+ for (let i = 0; i < binaryString.length; i++) {
+ bytes[i] = binaryString.charCodeAt(i);
+ }
+ return new TextDecoder("utf-8").decode(bytes);
 }
 
 /**
@@ -487,6 +495,13 @@ export function stripQuotedReply(
 ): string {
  if (!content) return content;
 
+ // Forwarded messages: the forwarded email IS the content the user wants to
+ // read. Gmail/Apple Mail wrap a forward in the same quote container Gmail uses
+ // for reply quotes, so the reply-stripping below would delete the whole body
+ // and leave an empty note. Keep the content as-is when it's a forward whose
+ // marker precedes any reply boundary.
+ if (isForwardedMessage(content)) return content;
+
  if (contentType === "html") {
  // Gmail wraps quoted replies in <div class="gmail_quote">
  // Remove it and everything after it
@@ -573,19 +588,28 @@ export function stripQuotedReply(
  .trim();
  }
  }
-
- // Forwarded message separator
- if (line === "---------- Forwarded message ----------") {
- return lines
- .slice(0, i)
- .join("\n")
- .trim();
- }
  }
 
  return content;
 }
 
+/**
+ * Detects a forwarded message so {@link stripQuotedReply} can preserve it.
+ * Matches Gmail's dashed "---------- Forwarded message ---------" marker and
+ * Apple Mail's "Begin forwarded message:". Returns false when a reply boundary
+ * ("On … wrote:") precedes the forward marker — that's a reply quoting a
+ * forward, which the reply-stripper should still trim.
+ */
+function isForwardedMessage(content: string): boolean {
+ const fwdIdx = content.search(
+ /(-{2,}\s*Forwarded message\s*-{2,}|Begin forwarded message:)/i
+ );
+ if (fwdIdx === -1) return false;
+ const replyIdx = content.search(/On\s[\s\S]{0,200}?\swrote:/i);
+ if (replyIdx !== -1 && replyIdx < fwdIdx) return false;
+ return true;
+}
+
 /**
  * Recursively collects attachment parts from a Gmail message payload.
  * An attachment part has a non-empty filename and a body.attachmentId.