Skip to content

The open alternative to Salesforce, designed for AI.

Send Email UI IMAP/SMTP message threading fix (#20784)

neo7731e2ae5342b55
diff --git a/packages/twenty-server/src/engine/core-modules/tool/tools/email-tool/email-composer.service.ts b/packages/twenty-server/src/engine/core-modules/tool/tools/email-tool/email-composer.service.ts
index 8e3e3670759..96324b7405f 100644
--- a/packages/twenty-server/src/engine/core-modules/tool/tools/email-tool/email-composer.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/tool/tools/email-tool/email-composer.service.ts
@@ -2,6 +2,7 @@ import { Injectable, Logger } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { toPlainText } from '@react-email/render';
+import { isNonEmptyString } from '@sniptt/guards';
import DOMPurify from 'dompurify';
import { MAX_EMAIL_RECIPIENTS } from 'twenty-shared/constants';
import {
@@ -10,7 +11,7 @@ import {
FileFolder,
} from 'twenty-shared/types';
import { isDefined, isValidUuid } from 'twenty-shared/utils';
-import { In, type Repository } from 'typeorm';
+import { In, LessThanOrEqual, type Repository } from 'typeorm';
import { z } from 'zod';
import { FileEntity } from 'src/engine/core-modules/file/entities/file.entity';
@@ -19,18 +20,24 @@ import {
EmailToolException,
EmailToolExceptionCode,
} from 'src/engine/core-modules/tool/tools/email-tool/exceptions/email-tool.exception';
-import { EmailComposerResult } from 'src/engine/core-modules/tool/tools/email-tool/types/email-composer-result.type';
import { type ComposeEmailParams } from 'src/engine/core-modules/tool/tools/email-tool/types/compose-email-params.type';
+import { EmailComposerResult } from 'src/engine/core-modules/tool/tools/email-tool/types/email-composer-result.type';
import { parseCommaSeparatedEmails } from 'src/engine/core-modules/tool/tools/email-tool/utils/parse-comma-separated-emails.util';
import { type ToolExecutionContext } from 'src/engine/core-modules/tool/types/tool-execution-context.type';
import { ConnectedAccountEntity } from 'src/engine/metadata-modules/connected-account/entities/connected-account.entity';
import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';
import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
-import { MessagingAccountAuthenticationService } from 'src/modules/messaging/message-import-manager/services/messaging-account-authentication.service';
import { type MessageChannelMessageAssociationWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-channel-message-association.workspace-entity';
import { type MessageWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message.workspace-entity';
+import { MessagingAccountAuthenticationService } from 'src/modules/messaging/message-import-manager/services/messaging-account-authentication.service';
import { type MessageAttachment } from 'src/modules/messaging/message-import-manager/types/message';
import { streamToBuffer } from 'src/utils/stream-to-buffer';
+
+type ParentThreadContext = {
+ threadExternalId?: string;
+ references?: string[];
+};
+
@Injectable()
export class EmailComposerService {
private readonly logger = new Logger(EmailComposerService.name);
@@ -232,13 +239,13 @@ export class EmailComposerService {
return attachments;
}
- // Look up the provider-specific thread ID (e.g. Gmail threadId) from the
- // parent message so replies can be explicitly threaded in the provider API.
- private async getThreadExternalId(
+ // Resolve parent's root thread id (Gmail/MS native or stored) + RFC 5322 §3.6.4
+ // References chain so replies thread on both Twenty and recipient mail clients.
+ private async getParentThreadContext(
workspaceId: string,
inReplyTo: string,
messageChannelId: string,
- ): Promise<string | undefined> {
+ ): Promise<ParentThreadContext> {
const authContext = buildSystemAuthContext(workspaceId);
return this.globalWorkspaceOrmManager.executeInWorkspaceContext(
@@ -253,8 +260,12 @@ export class EmailComposerService {
where: { headerMessageId: inReplyTo },
});
- if (!parentMessage) {
- return undefined;
+ if (
+ !isDefined(parentMessage) ||
+ !isDefined(parentMessage.messageThreadId) ||
+ !isDefined(parentMessage.receivedAt)
+ ) {
+ return {};
}
const associationRepository =
@@ -263,14 +274,29 @@ export class EmailComposerService {
'messageChannelMessageAssociation',
);
- const association = await associationRepository.findOne({
- where: {
- messageId: parentMessage.id,
- messageChannelId,
- },
- });
-
- return association?.messageThreadExternalId ?? undefined;
+ const [association, ancestorMessages] = await Promise.all([
+ associationRepository.findOne({
+ where: { messageId: parentMessage.id, messageChannelId },
+ select: { messageThreadExternalId: true },
+ }),
+ messageRepository.find({
+ where: {
+ messageThreadId: parentMessage.messageThreadId,
+ receivedAt: LessThanOrEqual(parentMessage.receivedAt),
+ },
+ select: { headerMessageId: true },
+ order: { receivedAt: 'ASC' },
+ }),
+ ]);
+
+ const references = ancestorMessages
+ .map((message) => message.headerMessageId)
+ .filter(isNonEmptyString);
+
+ return {
+ threadExternalId: association?.messageThreadExternalId ?? undefined,
+ references: references.length > 0 ? references : undefined,
+ };
},
authContext,
);
@@ -397,15 +423,14 @@ export class EmailComposerService {
const plainTextBody = toPlainText(sanitizedHtmlBody);
const sanitizedSubject = purify.sanitize(subject || '');
- let threadExternalId: string | undefined;
-
- if (inReplyTo && isDefined(messageChannel)) {
- threadExternalId = await this.getThreadExternalId(
- workspaceId,
- inReplyTo,
- messageChannel.id,
- );
- }
+ const { threadExternalId, references } =
+ isDefined(inReplyTo) && isDefined(messageChannel)
+ ? await this.getParentThreadContext(
+ workspaceId,
+ inReplyTo,
+ messageChannel.id,
+ )
+ : {};
return {
success: true,
@@ -421,6 +446,7 @@ export class EmailComposerService {
shouldPersistMessage: isDefined(messageChannel),
inReplyTo,
threadExternalId,
+ references,
},
};
}
diff --git a/packages/twenty-server/src/engine/core-modules/tool/tools/email-tool/types/composed-email.type.ts b/packages/twenty-server/src/engine/core-modules/tool/tools/email-tool/types/composed-email.type.ts
index aaa3d8f1689..04851909713 100644
--- a/packages/twenty-server/src/engine/core-modules/tool/tools/email-tool/types/composed-email.type.ts
+++ b/packages/twenty-server/src/engine/core-modules/tool/tools/email-tool/types/composed-email.type.ts
@@ -13,4 +13,5 @@ export type ComposedEmail = {
shouldPersistMessage: boolean;
inReplyTo?: string;
threadExternalId?: string;
+ references?: string[];
};
diff --git a/packages/twenty-server/src/modules/messaging/message-outbound-manager/services/send-email.service.ts b/packages/twenty-server/src/modules/messaging/message-outbound-manager/services/send-email.service.ts
index f8b26f71cf9..7efef50d5ec 100644
--- a/packages/twenty-server/src/modules/messaging/message-outbound-manager/services/send-email.service.ts
+++ b/packages/twenty-server/src/modules/messaging/message-outbound-manager/services/send-email.service.ts
@@ -26,6 +26,7 @@ export class SendEmailService {
attachments: data.attachments,
inReplyTo: data.inReplyTo,
threadExternalId: data.threadExternalId,
+ references: data.references,
},
data.connectedAccount,
);
@@ -45,6 +46,7 @@ export class SendEmailService {
connectedAccount: data.connectedAccount,
messageChannelId: data.messageChannelId!,
inReplyTo: data.inReplyTo,
+ parentThreadExternalId: data.threadExternalId,
workspaceId,
});
} catch (persistenceError) {
diff --git a/packages/twenty-server/src/modules/messaging/message-outbound-manager/types/persist-sent-message-input.type.ts b/packages/twenty-server/src/modules/messaging/message-outbound-manager/types/persist-sent-message-input.type.ts
index b0b18b774f1..872d6e19cec 100644
--- a/packages/twenty-server/src/modules/messaging/message-outbound-manager/types/persist-sent-message-input.type.ts
+++ b/packages/twenty-server/src/modules/messaging/message-outbound-manager/types/persist-sent-message-input.type.ts
@@ -9,5 +9,6 @@ export type PersistSentMessageInput = {
connectedAccount: Pick<ConnectedAccountEntity, 'id' | 'handle'>;
messageChannelId: string;
inReplyTo?: string;
+ parentThreadExternalId?: string;
workspaceId: string;
};
diff --git a/packages/twenty-server/src/modules/messaging/message-outbound-manager/types/send-message-input.type.ts b/packages/twenty-server/src/modules/messaging/message-outbound-manager/types/send-message-input.type.ts
index 229928ae2f1..3c333399ed4 100644
--- a/packages/twenty-server/src/modules/messaging/message-outbound-manager/types/send-message-input.type.ts
+++ b/packages/twenty-server/src/modules/messaging/message-outbound-manager/types/send-message-input.type.ts
@@ -14,4 +14,5 @@ export type SendMessageInput = {
}[];
inReplyTo?: string;
threadExternalId?: string;
+ references?: string[];
};
diff --git a/packages/twenty-server/src/modules/messaging/message-outbound-manager/utils/__tests__/format-sent-message.util.spec.ts b/packages/twenty-server/src/modules/messaging/message-outbound-manager/utils/__tests__/format-sent-message.util.spec.ts
index b962ae3771d..f73e9cf086d 100644
--- a/packages/twenty-server/src/modules/messaging/message-outbound-manager/utils/__tests__/format-sent-message.util.spec.ts
+++ b/packages/twenty-server/src/modules/messaging/message-outbound-manager/utils/__tests__/format-sent-message.util.spec.ts
@@ -79,6 +79,22 @@ describe('formatSentMessage', () => {
expect(message.headerMessageId).toBe('<[email protected]>');
});
+ it('should persist IMAP/SMTP replies under the parent thread external id rather than the immediate parent Message-ID', () => {
+ const message = formatSentMessage(
+ buildInput({
+ sendResult: {
+ headerMessageId: '<[email protected]>',
+ messageExternalId: undefined,
+ threadExternalId: undefined,
+ },
+ inReplyTo: '<[email protected]>',
+ parentThreadExternalId: '<[email protected]>',
+ }),
+ );
+
+ expect(message.messageThreadExternalId).toBe('<[email protected]>');
+ });
+
it('should copy subject and body verbatim and start with no folder associations', () => {
const message = formatSentMessage(buildInput());
diff --git a/packages/twenty-server/src/modules/messaging/message-outbound-manager/utils/__tests__/resolve-outbound-thread-external-id.util.spec.ts b/packages/twenty-server/src/modules/messaging/message-outbound-manager/utils/__tests__/resolve-outbound-thread-external-id.util.spec.ts
index 245e169b414..addad6f4c1a 100644
--- a/packages/twenty-server/src/modules/messaging/message-outbound-manager/utils/__tests__/resolve-outbound-thread-external-id.util.spec.ts
+++ b/packages/twenty-server/src/modules/messaging/message-outbound-manager/utils/__tests__/resolve-outbound-thread-external-id.util.spec.ts
@@ -14,7 +14,21 @@ describe('resolveOutboundThreadExternalId', () => {
expect(result).toBe('gmail-thread-id');
});
- it('should fall back to inReplyTo so IMAP/SMTP replies attach to the parent thread', () => {
+ it('should prefer the parent-derived thread id over inReplyTo so IMAP/SMTP replies attach to the original thread root, not the immediate parent', () => {
+ const result = resolveOutboundThreadExternalId({
+ sendResult: {
+ headerMessageId: '<[email protected]>',
+ messageExternalId: undefined,
+ threadExternalId: undefined,
+ },
+ parentThreadExternalId: '<[email protected]>',
+ inReplyTo: '<[email protected]>',
+ });
+
+ expect(result).toBe('<[email protected]>');
+ });
+
+ it('should fall back to inReplyTo when the parent is unknown locally so the reply still anchors on the parent Message-ID per RFC 5322', () => {
const result = resolveOutboundThreadExternalId({
sendResult: {
headerMessageId: '<[email protected]>',
diff --git a/packages/twenty-server/src/modules/messaging/message-outbound-manager/utils/format-sent-message.util.ts b/packages/twenty-server/src/modules/messaging/message-outbound-manager/utils/format-sent-message.util.ts
index 0a39ebba3e2..83150b6c46e 100644
--- a/packages/twenty-server/src/modules/messaging/message-outbound-manager/utils/format-sent-message.util.ts
+++ b/packages/twenty-server/src/modules/messaging/message-outbound-manager/utils/format-sent-message.util.ts
@@ -46,6 +46,7 @@ export const formatSentMessage = (
headerMessageId,
messageThreadExternalId: resolveOutboundThreadExternalId({
sendResult: input.sendResult,
+ parentThreadExternalId: input.parentThreadExternalId,
inReplyTo: input.inReplyTo,
}),
subject: input.subject,
diff --git a/packages/twenty-server/src/modules/messaging/message-outbound-manager/utils/resolve-outbound-thread-external-id.util.ts b/packages/twenty-server/src/modules/messaging/message-outbound-manager/utils/resolve-outbound-thread-external-id.util.ts
index 873da0cd172..466e6c34ea0 100644
--- a/packages/twenty-server/src/modules/messaging/message-outbound-manager/utils/resolve-outbound-thread-external-id.util.ts
+++ b/packages/twenty-server/src/modules/messaging/message-outbound-manager/utils/resolve-outbound-thread-external-id.util.ts
@@ -4,17 +4,22 @@ import { type SendMessageResult } from 'src/modules/messaging/message-outbound-m
export const resolveOutboundThreadExternalId = ({
sendResult,
+ parentThreadExternalId,
inReplyTo,
}: {
sendResult: SendMessageResult;
+ parentThreadExternalId?: string;
inReplyTo?: string;
}): string => {
if (isNonEmptyString(sendResult.threadExternalId)) {
return sendResult.threadExternalId;
}
- // IMAP/SMTP have no server-side thread id. Reuse the parent's Message-ID so
- // the reply attaches to the same thread the parent stored under.
+ // IMAP/SMTP: anchor on parent's thread id so replies stay in the original thread.
+ if (isNonEmptyString(parentThreadExternalId)) {
+ return parentThreadExternalId;
+ }
+
if (isNonEmptyString(inReplyTo)) {
return inReplyTo;
}
diff --git a/packages/twenty-server/src/modules/messaging/message-outbound-manager/utils/to-mail-composer-options.util.ts b/packages/twenty-server/src/modules/messaging/message-outbound-manager/utils/to-mail-composer-options.util.ts
index c48e080705a..73e40ae0a98 100644
--- a/packages/twenty-server/src/modules/messaging/message-outbound-manager/utils/to-mail-composer-options.util.ts
+++ b/packages/twenty-server/src/modules/messaging/message-outbound-manager/utils/to-mail-composer-options.util.ts
@@ -1,4 +1,5 @@
import { type SendMessageInput } from 'src/modules/messaging/message-outbound-manager/types/send-message-input.type';
+import { isDefined } from 'twenty-shared/utils';
export const toMailComposerOptions = (
from: string,
@@ -24,7 +25,11 @@ export const toMailComposerOptions = (
...(sendMessageInput.inReplyTo
? {
inReplyTo: sendMessageInput.inReplyTo,
- references: sendMessageInput.inReplyTo,
+ references:
+ isDefined(sendMessageInput.references) &&
+ sendMessageInput.references.length > 0
+ ? sendMessageInput.references
+ : sendMessageInput.inReplyTo,
}
: {}),
};