Skip to content

The open alternative to Salesforce, designed for AI.

Fix IMAP messages without Date header (#25120)

Leonardo Orlandini Trancozo56f97bb85635
diff --git a/packages/twenty-front/src/modules/activities/emails/components/EmailThreadMessageSender.tsx b/packages/twenty-front/src/modules/activities/emails/components/EmailThreadMessageSender.tsx
index b5650d88963..f50831d29e7 100644
--- a/packages/twenty-front/src/modules/activities/emails/components/EmailThreadMessageSender.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/components/EmailThreadMessageSender.tsx
@@ -10,6 +10,7 @@ import {
beautifyPastDateRelativeToNow,
formatToHumanReadableDate,
} from '~/utils/date-utils';
+import { isDefined } from 'twenty-shared/utils';
const StyledEmailThreadMessageSender = styled.div`
display: flex;
@@ -25,7 +26,7 @@ const StyledThreadMessageSentAt = styled.div`
type EmailThreadMessageSenderProps = {
sender: EmailThreadMessageParticipant;
- sentAt: string;
+ sentAt: string | null;
};
export const EmailThreadMessageSender = ({
@@ -33,19 +34,29 @@ export const EmailThreadMessageSender = ({
sentAt,
}: EmailThreadMessageSenderProps) => {
const { localeCatalog } = useAtomStateValue(dateLocaleState);
- const tooltipId = `date-tooltip-${sentAt.replace(/[^a-zA-Z0-9]/g, '-')}`;
+ let sentAtContent = null;
+
+ if (isDefined(sentAt)) {
+ const tooltipId = `date-tooltip-${sentAt.replace(/[^a-zA-Z0-9]/g, '-')}`;
+
+ sentAtContent = (
+ <>
+ <StyledThreadMessageSentAt id={tooltipId}>
+ {beautifyPastDateRelativeToNow(sentAt, localeCatalog)}
+ </StyledThreadMessageSentAt>
+ <AppTooltip
+ anchorSelect={`#${tooltipId}`}
+ content={formatToHumanReadableDate(sentAt)}
+ place={TooltipPosition.Top}
+ />
+ </>
+ );
+ }
return (
<StyledEmailThreadMessageSender>
<ParticipantChip participant={sender} variant="bold" />
- <StyledThreadMessageSentAt id={tooltipId}>
- {beautifyPastDateRelativeToNow(sentAt, localeCatalog)}
- </StyledThreadMessageSentAt>
- <AppTooltip
- anchorSelect={`#${tooltipId}`}
- content={formatToHumanReadableDate(sentAt)}
- place={TooltipPosition.Top}
- />
+ {sentAtContent}
</StyledEmailThreadMessageSender>
);
};
diff --git a/packages/twenty-front/src/modules/activities/emails/components/__tests__/EmailThreadMessageSender.test.tsx b/packages/twenty-front/src/modules/activities/emails/components/__tests__/EmailThreadMessageSender.test.tsx
new file mode 100644
index 00000000000..539ca24c831
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/emails/components/__tests__/EmailThreadMessageSender.test.tsx
@@ -0,0 +1,42 @@
+import { render, screen } from '@testing-library/react';
+
+import { EmailThreadMessageSender } from '@/activities/emails/components/EmailThreadMessageSender';
+import { type EmailThreadMessageParticipant } from '@/activities/emails/types/EmailThreadMessageParticipant';
+
+const NOW = new Date('2026-08-31T12:00:00.000Z');
+const TWO_HOURS_BEFORE_NOW = '2026-08-31T10:00:00.000Z';
+
+const SENDER = {
+ id: 'sender-id',
+ displayName: 'Ada Lovelace',
+ handle: '[email protected]',
+} as EmailThreadMessageParticipant;
+
+describe('EmailThreadMessageSender', () => {
+ beforeEach(() => {
+ jest.useFakeTimers().setSystemTime(NOW);
+ });
+
+ afterEach(() => {
+ jest.useRealTimers();
+ });
+
+ it('renders the sender without a timestamp when the message has no received date', () => {
+ render(<EmailThreadMessageSender sender={SENDER} sentAt={null} />);
+
+ expect(screen.getByText('Ada Lovelace')).toBeInTheDocument();
+ expect(screen.queryByText(/ago/)).not.toBeInTheDocument();
+ });
+
+ it('renders the received date relative to now', () => {
+ render(
+ <EmailThreadMessageSender
+ sender={SENDER}
+ sentAt={TWO_HOURS_BEFORE_NOW}
+ />,
+ );
+
+ expect(screen.getByText('Ada Lovelace')).toBeInTheDocument();
+ expect(screen.getByText('about 2 hours ago')).toBeInTheDocument();
+ });
+});
diff --git a/packages/twenty-front/src/modules/activities/emails/types/EmailThreadMessage.ts b/packages/twenty-front/src/modules/activities/emails/types/EmailThreadMessage.ts
index 07a910caf7d..83c19889541 100644
--- a/packages/twenty-front/src/modules/activities/emails/types/EmailThreadMessage.ts
+++ b/packages/twenty-front/src/modules/activities/emails/types/EmailThreadMessage.ts
@@ -4,7 +4,7 @@ import { type MessageThread } from '@/activities/emails/types/MessageThread';
export type EmailThreadMessage = {
id: string;
text: string;
- receivedAt: string;
+ receivedAt: string | null;
subject: string;
headerMessageId: string;
messageThreadId: string;
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/imap/services/imap-get-messages.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/imap/services/imap-get-messages.service.ts
index 6720745c12f..faa6f847351 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/imap/services/imap-get-messages.service.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/imap/services/imap-get-messages.service.ts
@@ -9,6 +9,7 @@ import { ImapClientProvider } from 'src/modules/messaging/message-import-manager
import { ImapMessageParserService } from 'src/modules/messaging/message-import-manager/drivers/imap/services/imap-message-parser.service';
import { ImapMessagesImportErrorHandler } from 'src/modules/messaging/message-import-manager/drivers/imap/services/imap-messages-import-error-handler.service';
import { parseMessageId } from 'src/modules/messaging/message-import-manager/drivers/imap/utils/parse-message-id.util';
+import { resolveReceivedAt } from 'src/modules/messaging/message-import-manager/drivers/imap/utils/resolve-received-at.util';
import { type MessageWithParticipants } from 'src/modules/messaging/message-import-manager/types/message';
import { extractAddressesFromParsedEmail } from 'src/modules/messaging/message-import-manager/utils/extract-addresses-from-parsed-email.util';
import { extractMessageBodyText } from 'src/modules/messaging/message-import-manager/utils/extract-message-body-text.util';
@@ -146,6 +147,7 @@ export class ImapGetMessagesService {
folderExternalId,
connectedAccount,
result.flags,
+ result.internalDate,
),
);
}
@@ -164,6 +166,7 @@ export class ImapGetMessagesService {
folderExternalId: string,
connectedAccount: Pick<ConnectedAccountEntity, 'handle' | 'handleAliases'>,
flags?: Set<string>,
+ internalDate?: Date | string,
): MessageWithParticipants {
const fromAddresses = extractAddressesFromParsedEmail(parsed.from);
const senderAddress = fromAddresses[0]?.address ?? '';
@@ -179,7 +182,7 @@ export class ImapGetMessagesService {
headerMessageId: parsed.messageId || String(uid),
subject: sanitizeString(parsed.subject || ''),
text,
- receivedAt: parsed.date ? new Date(parsed.date) : null,
+ receivedAt: resolveReceivedAt({ headerDate: parsed.date, internalDate }),
direction: computeMessageDirection(senderAddress, connectedAccount),
attachments: (parsed.attachments || []).map((attachment) => ({
filename: attachment.filename || 'unnamed-attachment',
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/imap/services/imap-message-parser.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/imap/services/imap-message-parser.service.ts
index 6e8a90d75e7..fb97342ae7d 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/imap/services/imap-message-parser.service.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/imap/services/imap-message-parser.service.ts
@@ -7,6 +7,7 @@ export type MessageParseResult = {
uid: number;
parsed: ParsedEmail | null;
flags?: Set<string>;
+ internalDate?: Date | string;
error?: Error;
};
@@ -41,7 +42,7 @@ export class ImapMessageParserService {
const messages = await client.fetchAll(
uidSet,
- { uid: true, source: true, flags: true },
+ { uid: true, source: true, flags: true, internalDate: true },
{ uid: true },
);
@@ -81,22 +82,28 @@ export class ImapMessageParserService {
private async parseMessage(
message: FetchMessageObject,
): Promise<MessageParseResult> {
- const { uid, source, flags } = message;
+ const { uid, source, flags, internalDate } = message;
if (!source) {
this.logger.debug(`No source content for message UID ${uid}`);
- return { uid, parsed: null, flags };
+ return { uid, parsed: null, flags, internalDate };
}
try {
const parsed = await PostalMime.parse(source);
- return { uid, parsed, flags };
+ return { uid, parsed, flags, internalDate };
} catch (error) {
this.logger.error(`Failed to parse message UID ${uid}: ${error.message}`);
- return { uid, parsed: null, flags, error: error as Error };
+ return {
+ uid,
+ parsed: null,
+ flags,
+ internalDate,
+ error: error as Error,
+ };
}
}
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/imap/utils/__tests__/resolve-received-at.util.spec.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/imap/utils/__tests__/resolve-received-at.util.spec.ts
new file mode 100644
index 00000000000..d3d4687a08a
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/imap/utils/__tests__/resolve-received-at.util.spec.ts
@@ -0,0 +1,49 @@
+import { resolveReceivedAt } from 'src/modules/messaging/message-import-manager/drivers/imap/utils/resolve-received-at.util';
+
+const HEADER_DATE = '2026-08-31T10:00:00.000Z';
+const INTERNAL_DATE = new Date('2026-08-31T12:00:00.000Z');
+const IMPORT_TIME = new Date('2026-08-31T14:00:00.000Z');
+
+describe('resolveReceivedAt', () => {
+ it('uses the Date header when it is valid', () => {
+ const result = resolveReceivedAt({
+ headerDate: HEADER_DATE,
+ internalDate: INTERNAL_DATE,
+ });
+
+ expect(result).toEqual(new Date(HEADER_DATE));
+ });
+
+ it('falls back to the IMAP internal date when the Date header is missing', () => {
+ const result = resolveReceivedAt({ internalDate: INTERNAL_DATE });
+
+ expect(result).toEqual(INTERNAL_DATE);
+ });
+
+ it('falls back to the IMAP internal date when the Date header is unparseable', () => {
+ const result = resolveReceivedAt({
+ headerDate: 'not a date',
+ internalDate: INTERNAL_DATE,
+ });
+
+ expect(result).toEqual(INTERNAL_DATE);
+ });
+
+ it('accepts the internal date as a string', () => {
+ const result = resolveReceivedAt({
+ internalDate: INTERNAL_DATE.toISOString(),
+ });
+
+ expect(result).toEqual(INTERNAL_DATE);
+ });
+
+ it('falls back to the import time when neither date is usable', () => {
+ jest.useFakeTimers().setSystemTime(IMPORT_TIME);
+
+ const result = resolveReceivedAt({ headerDate: 'not a date' });
+
+ expect(result).toEqual(IMPORT_TIME);
+
+ jest.useRealTimers();
+ });
+});
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/imap/utils/resolve-received-at.util.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/imap/utils/resolve-received-at.util.ts
new file mode 100644
index 00000000000..d6842c0bf01
--- /dev/null
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/imap/utils/resolve-received-at.util.ts
@@ -0,0 +1,25 @@
+import { isValidDate } from 'src/utils/date/isValidDate';
+
+type ResolveReceivedAtArgs = {
+ headerDate?: string;
+ internalDate?: Date | string;
+};
+
+export const resolveReceivedAt = ({
+ headerDate,
+ internalDate,
+}: ResolveReceivedAtArgs): Date => {
+ const receivedAtFromHeader = headerDate ? new Date(headerDate) : undefined;
+
+ if (isValidDate(receivedAtFromHeader)) {
+ return receivedAtFromHeader;
+ }
+
+ const receivedAtFromImap = internalDate ? new Date(internalDate) : undefined;
+
+ if (isValidDate(receivedAtFromImap)) {
+ return receivedAtFromImap;
+ }
+
+ return new Date();
+};