From 9ba211055a5c037cb4aa19178c467dcc59688203 Mon Sep 17 00:00:00 2001
From: Charles Bochet <charlesBochet@users.noreply.github.com>
Date: Mon, 8 Jul 2024 14:33:48 +0200
Subject: [PATCH] Add message import granulary on non-pro emails, group emails
 and received contact creation (#6156)

1) Remove featureFlag
2) Base contactCreation on messageChannel.autoContactCreationPolicy
4) add excludeProfessionalEmails + excludeGroupEmails logic
---
 .../OnboardingSyncEmailsSettingsCard.tsx      |  1 +
 ...AccountsCalendarVisibilitySettingsCard.tsx |  1 +
 ...ettingsAccountsMessageAutoCreationCard.tsx |  1 +
 .../SettingsAccountsMessageVisibilityCard.tsx |  1 +
 .../SettingsAccountsRadioSettingsCard.tsx     |  3 +
 .../SettingsAccountsRowDropdownMenu.tsx       |  8 +--
 .../src/modules/ui/input/components/Radio.tsx | 13 ++--
 .../modules/ui/layout/tab/components/Tab.tsx  |  2 +-
 .../typeorm-seeds/core/feature-flags.ts       |  5 --
 .../feature-flag/feature-flag.entity.ts       | 13 ++--
 .../commands/add-standard-id.command.ts       | 10 ++-
 .../create-company-and-contact.service.ts     | 41 +++++-------
 ...es-and-enqueue-contact-creation.service.ts | 65 +++++++++++--------
 ...messaging-gmail-messages-import.service.ts | 34 +++++-----
 .../utils/filter-emails.util.ts               | 21 +-----
 ...eate-company-and-contact-after-sync.job.ts | 57 +++++++---------
 .../twenty-server/src/utils/is-group-email.ts |  6 ++
 17 files changed, 135 insertions(+), 147 deletions(-)
 create mode 100644 packages/twenty-server/src/utils/is-group-email.ts

diff --git a/packages/twenty-front/src/modules/onboarding/components/OnboardingSyncEmailsSettingsCard.tsx b/packages/twenty-front/src/modules/onboarding/components/OnboardingSyncEmailsSettingsCard.tsx
index 61605ec003..2a01962fdf 100644
--- a/packages/twenty-front/src/modules/onboarding/components/OnboardingSyncEmailsSettingsCard.tsx
+++ b/packages/twenty-front/src/modules/onboarding/components/OnboardingSyncEmailsSettingsCard.tsx
@@ -12,6 +12,7 @@ export const OnboardingSyncEmailsSettingsCard = ({
   value = MessageChannelVisibility.ShareEverything,
 }: OnboardingSyncEmailsSettingsCardProps) => (
   <SettingsAccountsRadioSettingsCard
+    name="sync-emails-visiblity"
     options={onboardingSyncEmailsOptions}
     value={value}
     onChange={onChange}
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarVisibilitySettingsCard.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarVisibilitySettingsCard.tsx
index c626b8bb0a..20344671bb 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarVisibilitySettingsCard.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarVisibilitySettingsCard.tsx
@@ -33,6 +33,7 @@ export const SettingsAccountsEventVisibilitySettingsCard = ({
   value = CalendarChannelVisibility.ShareEverything,
 }: SettingsAccountsEventVisibilitySettingsCardProps) => (
   <SettingsAccountsRadioSettingsCard
+    name="event-visibility"
     options={eventSettingsVisibilityOptions}
     value={value}
     onChange={onChange}
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsMessageAutoCreationCard.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsMessageAutoCreationCard.tsx
index f87c96f352..ea01199a02 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsMessageAutoCreationCard.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsMessageAutoCreationCard.tsx
@@ -40,6 +40,7 @@ export const SettingsAccountsMessageAutoCreationCard = ({
   value = MessageChannelContactAutoCreationPolicy.SENT_AND_RECEIVED,
 }: SettingsAccountsMessageAutoCreationCardProps) => (
   <SettingsAccountsRadioSettingsCard
+    name="message-auto-creation"
     options={autoCreationOptions}
     value={value}
     onChange={onChange}
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsMessageVisibilityCard.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsMessageVisibilityCard.tsx
index a2f10bc8c8..e0aa3172fd 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsMessageVisibilityCard.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsMessageVisibilityCard.tsx
@@ -51,6 +51,7 @@ export const SettingsAccountsMessageVisibilityCard = ({
   value = MessageChannelVisibility.ShareEverything,
 }: SettingsAccountsMessageVisibilityCardProps) => (
   <SettingsAccountsRadioSettingsCard
+    name="message-visibility"
     options={inboxSettingsVisibilityOptions}
     value={value}
     onChange={onChange}
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsRadioSettingsCard.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsRadioSettingsCard.tsx
index 350bf71def..aaf856456f 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsRadioSettingsCard.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsRadioSettingsCard.tsx
@@ -10,6 +10,7 @@ type SettingsAccountsRadioSettingsCardProps<Option extends { value: string }> =
     onChange: (nextValue: Option['value']) => void;
     options: Option[];
     value: Option['value'];
+    name: string;
   };
 
 const StyledCardContent = styled(CardContent)`
@@ -49,6 +50,7 @@ export const SettingsAccountsRadioSettingsCard = <
   onChange,
   options,
   value,
+  name,
 }: SettingsAccountsRadioSettingsCardProps<Option>) => (
   <Card rounded>
     {options.map((option, index) => (
@@ -63,6 +65,7 @@ export const SettingsAccountsRadioSettingsCard = <
           <StyledDescription>{option.description}</StyledDescription>
         </div>
         <StyledRadio
+          name={name}
           value={option.value}
           onCheckedChange={() => onChange(option.value)}
           checked={value === option.value}
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsRowDropdownMenu.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsRowDropdownMenu.tsx
index 8e5afcec61..515dce50a6 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsRowDropdownMenu.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsRowDropdownMenu.tsx
@@ -54,9 +54,7 @@ export const SettingsAccountsRowDropdownMenu = ({
               LeftIcon={IconMail}
               text="Emails settings"
               onClick={() => {
-                navigate(
-                  `/settings/accounts/emails/${account.messageChannels[0].id}`,
-                );
+                navigate(`/settings/accounts/emails`);
                 closeDropdown();
               }}
             />
@@ -64,9 +62,7 @@ export const SettingsAccountsRowDropdownMenu = ({
               LeftIcon={IconCalendarEvent}
               text="Calendar settings"
               onClick={() => {
-                navigate(
-                  `/settings/accounts/calendars/${account.calendarChannels[0].id}`,
-                );
+                navigate(`/settings/accounts/calendars`);
                 closeDropdown();
               }}
             />
diff --git a/packages/twenty-front/src/modules/ui/input/components/Radio.tsx b/packages/twenty-front/src/modules/ui/input/components/Radio.tsx
index 1626e13214..5530aaa3a3 100644
--- a/packages/twenty-front/src/modules/ui/input/components/Radio.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/Radio.tsx
@@ -1,8 +1,9 @@
-import * as React from 'react';
 import styled from '@emotion/styled';
 import { motion } from 'framer-motion';
+import * as React from 'react';
 import { RGBA } from 'twenty-ui';
 
+import { v4 } from 'uuid';
 import { RadioGroup } from './RadioGroup';
 
 export enum RadioSize {
@@ -105,6 +106,7 @@ const StyledLabel = styled.label<LabelProps>`
 export type RadioProps = {
   checked?: boolean;
   className?: string;
+  name?: string;
   disabled?: boolean;
   label?: string;
   labelPosition?: LabelPosition;
@@ -118,6 +120,7 @@ export type RadioProps = {
 export const Radio = ({
   checked,
   className,
+  name = 'input-radio',
   disabled = false,
   label,
   labelPosition = LabelPosition.Right,
@@ -131,12 +134,14 @@ export const Radio = ({
     onCheckedChange?.(event.target.checked);
   };
 
+  const optionId = v4();
+
   return (
     <StyledContainer className={className} labelPosition={labelPosition}>
       <StyledRadioInput
         type="radio"
-        id="input-radio"
-        name="input-radio"
+        id={optionId}
+        name={name}
         data-testid="input-radio"
         checked={checked}
         value={value || label}
@@ -149,7 +154,7 @@ export const Radio = ({
       />
       {label && (
         <StyledLabel
-          htmlFor="input-radio"
+          htmlFor={optionId}
           labelPosition={labelPosition}
           disabled={disabled}
         >
diff --git a/packages/twenty-front/src/modules/ui/layout/tab/components/Tab.tsx b/packages/twenty-front/src/modules/ui/layout/tab/components/Tab.tsx
index 2bfc1dbfba..e723f0ae84 100644
--- a/packages/twenty-front/src/modules/ui/layout/tab/components/Tab.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/tab/components/Tab.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
 import { IconComponent, Pill } from 'twenty-ui';
@@ -41,6 +40,7 @@ const StyledHover = styled.span`
   padding: ${({ theme }) => theme.spacing(1)};
   padding-left: ${({ theme }) => theme.spacing(2)};
   padding-right: ${({ theme }) => theme.spacing(2)};
+  font-weight: ${({ theme }) => theme.font.weight.medium};
 
   &:hover {
     background: ${({ theme }) => theme.background.tertiary};
diff --git a/packages/twenty-server/src/database/typeorm-seeds/core/feature-flags.ts b/packages/twenty-server/src/database/typeorm-seeds/core/feature-flags.ts
index 37c2ca2441..a030ad88f8 100644
--- a/packages/twenty-server/src/database/typeorm-seeds/core/feature-flags.ts
+++ b/packages/twenty-server/src/database/typeorm-seeds/core/feature-flags.ts
@@ -40,11 +40,6 @@ export const seedFeatureFlags = async (
         workspaceId: workspaceId,
         value: true,
       },
-      {
-        key: FeatureFlagKeys.IsContactCreationForSentAndReceivedEmailsEnabled,
-        workspaceId: workspaceId,
-        value: true,
-      },
       {
         key: FeatureFlagKeys.IsMessagingAliasFetchingEnabled,
         workspaceId: workspaceId,
diff --git a/packages/twenty-server/src/engine/core-modules/feature-flag/feature-flag.entity.ts b/packages/twenty-server/src/engine/core-modules/feature-flag/feature-flag.entity.ts
index 29fb9a8c80..b064661900 100644
--- a/packages/twenty-server/src/engine/core-modules/feature-flag/feature-flag.entity.ts
+++ b/packages/twenty-server/src/engine/core-modules/feature-flag/feature-flag.entity.ts
@@ -1,19 +1,19 @@
 import { Field, ObjectType } from '@nestjs/graphql';
 
+import { IDField } from '@ptc-org/nestjs-query-graphql';
 import {
-  Entity,
-  Unique,
-  PrimaryGeneratedColumn,
   Column,
   CreateDateColumn,
-  UpdateDateColumn,
+  Entity,
   ManyToOne,
+  PrimaryGeneratedColumn,
   Relation,
+  Unique,
+  UpdateDateColumn,
 } from 'typeorm';
-import { IDField } from '@ptc-org/nestjs-query-graphql';
 
-import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 
 export enum FeatureFlagKeys {
   IsBlocklistEnabled = 'IS_BLOCKLIST_ENABLED',
@@ -21,7 +21,6 @@ export enum FeatureFlagKeys {
   IsAirtableIntegrationEnabled = 'IS_AIRTABLE_INTEGRATION_ENABLED',
   IsPostgreSQLIntegrationEnabled = 'IS_POSTGRESQL_INTEGRATION_ENABLED',
   IsStripeIntegrationEnabled = 'IS_STRIPE_INTEGRATION_ENABLED',
-  IsContactCreationForSentAndReceivedEmailsEnabled = 'IS_CONTACT_CREATION_FOR_SENT_AND_RECEIVED_EMAILS_ENABLED',
   IsCopilotEnabled = 'IS_COPILOT_ENABLED',
   IsMessagingAliasFetchingEnabled = 'IS_MESSAGING_ALIAS_FETCHING_ENABLED',
   IsGoogleCalendarSyncV2Enabled = 'IS_GOOGLE_CALENDAR_SYNC_V2_ENABLED',
diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/commands/add-standard-id.command.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/commands/add-standard-id.command.ts
index c3b431285d..f351cfabf5 100644
--- a/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/commands/add-standard-id.command.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/commands/add-standard-id.command.ts
@@ -4,12 +4,12 @@ import { InjectDataSource } from '@nestjs/typeorm';
 import { Command, CommandRunner, Option } from 'nest-commander';
 import { DataSource } from 'typeorm';
 
-import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
 import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
-import { standardObjectMetadataDefinitions } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects';
-import { StandardObjectFactory } from 'src/engine/workspace-manager/workspace-sync-metadata/factories/standard-object.factory';
-import { StandardFieldFactory } from 'src/engine/workspace-manager/workspace-sync-metadata/factories/standard-field.factory';
+import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
 import { CustomWorkspaceEntity } from 'src/engine/twenty-orm/custom.workspace-entity';
+import { StandardFieldFactory } from 'src/engine/workspace-manager/workspace-sync-metadata/factories/standard-field.factory';
+import { StandardObjectFactory } from 'src/engine/workspace-manager/workspace-sync-metadata/factories/standard-object.factory';
+import { standardObjectMetadataDefinitions } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects';
 import { computeStandardFields } from 'src/engine/workspace-manager/workspace-sync-metadata/utils/compute-standard-fields.util';
 
 interface RunCommandOptions {
@@ -58,7 +58,6 @@ export class AddStandardIdCommand extends CommandRunner {
             IS_AIRTABLE_INTEGRATION_ENABLED: true,
             IS_POSTGRESQL_INTEGRATION_ENABLED: true,
             IS_STRIPE_INTEGRATION_ENABLED: false,
-            IS_CONTACT_CREATION_FOR_SENT_AND_RECEIVED_EMAILS_ENABLED: true,
             IS_COPILOT_ENABLED: false,
             IS_MESSAGING_ALIAS_FETCHING_ENABLED: true,
             IS_GOOGLE_CALENDAR_SYNC_V2_ENABLED: true,
@@ -77,7 +76,6 @@ export class AddStandardIdCommand extends CommandRunner {
           IS_AIRTABLE_INTEGRATION_ENABLED: true,
           IS_POSTGRESQL_INTEGRATION_ENABLED: true,
           IS_STRIPE_INTEGRATION_ENABLED: false,
-          IS_CONTACT_CREATION_FOR_SENT_AND_RECEIVED_EMAILS_ENABLED: true,
           IS_COPILOT_ENABLED: false,
           IS_MESSAGING_ALIAS_FETCHING_ENABLED: true,
           IS_GOOGLE_CALENDAR_SYNC_V2_ENABLED: true,
diff --git a/packages/twenty-server/src/modules/connected-account/auto-companies-and-contacts-creation/services/create-company-and-contact.service.ts b/packages/twenty-server/src/modules/connected-account/auto-companies-and-contacts-creation/services/create-company-and-contact.service.ts
index bc18008419..1b1bd3a510 100644
--- a/packages/twenty-server/src/modules/connected-account/auto-companies-and-contacts-creation/services/create-company-and-contact.service.ts
+++ b/packages/twenty-server/src/modules/connected-account/auto-companies-and-contacts-creation/services/create-company-and-contact.service.ts
@@ -1,30 +1,30 @@
 import { Injectable } from '@nestjs/common';
 import { EventEmitter2 } from '@nestjs/event-emitter';
 
-import { EntityManager } from 'typeorm';
-import compact from 'lodash.compact';
 import chunk from 'lodash.chunk';
+import compact from 'lodash.compact';
+import { EntityManager } from 'typeorm';
 
-import { getDomainNameFromHandle } from 'src/modules/calendar-messaging-participant/utils/get-domain-name-from-handle.util';
-import { CreateCompanyService } from 'src/modules/connected-account/auto-companies-and-contacts-creation/create-company/create-company.service';
-import { CreateContactService } from 'src/modules/connected-account/auto-companies-and-contacts-creation/create-contact/create-contact.service';
-import { PersonRepository } from 'src/modules/person/repositories/person.repository';
-import { WorkspaceMemberRepository } from 'src/modules/workspace-member/repositories/workspace-member.repository';
-import { isWorkEmail } from 'src/utils/is-work-email';
 import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
-import { PersonWorkspaceEntity } from 'src/modules/person/standard-objects/person.workspace-entity';
-import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
-import { getUniqueContactsAndHandles } from 'src/modules/connected-account/auto-companies-and-contacts-creation/utils/get-unique-contacts-and-handles.util';
-import { filterOutSelfAndContactsFromCompanyOrWorkspace } from 'src/modules/connected-account/auto-companies-and-contacts-creation/utils/filter-out-contacts-from-company-or-workspace.util';
-import { MessagingMessageParticipantService } from 'src/modules/messaging/common/services/messaging-message-participant.service';
-import { MessageParticipantWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-participant.workspace-entity';
 import { WorkspaceDataSource } from 'src/engine/twenty-orm/datasource/workspace.datasource';
 import { InjectWorkspaceDatasource } from 'src/engine/twenty-orm/decorators/inject-workspace-datasource.decorator';
-import { ConnectedAccountWorkspaceEntity } from 'src/modules/connected-account/standard-objects/connected-account.workspace-entity';
+import { getDomainNameFromHandle } from 'src/modules/calendar-messaging-participant/utils/get-domain-name-from-handle.util';
 import { CalendarEventParticipantService } from 'src/modules/calendar/calendar-event-participant-manager/services/calendar-event-participant.service';
-import { CONTACTS_CREATION_BATCH_SIZE } from 'src/modules/connected-account/auto-companies-and-contacts-creation/constants/contacts-creation-batch-size.constant';
-import { Contact } from 'src/modules/connected-account/auto-companies-and-contacts-creation/types/contact.type';
 import { CalendarEventParticipantWorkspaceEntity } from 'src/modules/calendar/common/standard-objects/calendar-event-participant.workspace-entity';
+import { CONTACTS_CREATION_BATCH_SIZE } from 'src/modules/connected-account/auto-companies-and-contacts-creation/constants/contacts-creation-batch-size.constant';
+import { CreateCompanyService } from 'src/modules/connected-account/auto-companies-and-contacts-creation/create-company/create-company.service';
+import { CreateContactService } from 'src/modules/connected-account/auto-companies-and-contacts-creation/create-contact/create-contact.service';
+import { Contact } from 'src/modules/connected-account/auto-companies-and-contacts-creation/types/contact.type';
+import { filterOutSelfAndContactsFromCompanyOrWorkspace } from 'src/modules/connected-account/auto-companies-and-contacts-creation/utils/filter-out-contacts-from-company-or-workspace.util';
+import { getUniqueContactsAndHandles } from 'src/modules/connected-account/auto-companies-and-contacts-creation/utils/get-unique-contacts-and-handles.util';
+import { ConnectedAccountWorkspaceEntity } from 'src/modules/connected-account/standard-objects/connected-account.workspace-entity';
+import { MessagingMessageParticipantService } from 'src/modules/messaging/common/services/messaging-message-participant.service';
+import { MessageParticipantWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-participant.workspace-entity';
+import { PersonRepository } from 'src/modules/person/repositories/person.repository';
+import { PersonWorkspaceEntity } from 'src/modules/person/standard-objects/person.workspace-entity';
+import { WorkspaceMemberRepository } from 'src/modules/workspace-member/repositories/workspace-member.repository';
+import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
+import { isWorkEmail } from 'src/utils/is-work-email';
 
 @Injectable()
 export class CreateCompanyAndContactService {
@@ -52,9 +52,6 @@ export class CreateCompanyAndContactService {
       return [];
     }
 
-    // TODO: This is a feature that may be implemented in the future
-    const isContactAutoCreationForNonWorkEmailsEnabled = false;
-
     const workspaceMembers =
       await this.workspaceMemberRepository.getAllByWorkspaceId(
         workspaceId,
@@ -89,9 +86,7 @@ export class CreateCompanyAndContactService {
     const filteredContactsToCreate = uniqueContacts.filter(
       (participant) =>
         !alreadyCreatedContactEmails.includes(participant.handle) &&
-        participant.handle.includes('@') &&
-        (isContactAutoCreationForNonWorkEmailsEnabled ||
-          isWorkEmail(participant.handle)),
+        participant.handle.includes('@'),
     );
 
     const filteredContactsToCreateWithCompanyDomainNames =
diff --git a/packages/twenty-server/src/modules/messaging/common/services/messaging-save-messages-and-enqueue-contact-creation.service.ts b/packages/twenty-server/src/modules/messaging/common/services/messaging-save-messages-and-enqueue-contact-creation.service.ts
index f3200514b0..1a7b1176b6 100644
--- a/packages/twenty-server/src/modules/messaging/common/services/messaging-save-messages-and-enqueue-contact-creation.service.ts
+++ b/packages/twenty-server/src/modules/messaging/common/services/messaging-save-messages-and-enqueue-contact-creation.service.ts
@@ -1,31 +1,33 @@
 import { Injectable } from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
 import { EventEmitter2 } from '@nestjs/event-emitter';
+import { InjectRepository } from '@nestjs/typeorm';
 
 import { EntityManager, Repository } from 'typeorm';
 
+import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
+import { InjectMessageQueue } from 'src/engine/integrations/message-queue/decorators/message-queue.decorator';
 import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
 import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
 import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
-import { ConnectedAccountWorkspaceEntity } from 'src/modules/connected-account/standard-objects/connected-account.workspace-entity';
 import {
-  CreateCompanyAndContactJobData,
   CreateCompanyAndContactJob,
+  CreateCompanyAndContactJobData,
 } from 'src/modules/connected-account/auto-companies-and-contacts-creation/jobs/create-company-and-contact.job';
+import { ConnectedAccountWorkspaceEntity } from 'src/modules/connected-account/standard-objects/connected-account.workspace-entity';
+import { MessagingMessageParticipantService } from 'src/modules/messaging/common/services/messaging-message-participant.service';
+import { MessagingMessageService } from 'src/modules/messaging/common/services/messaging-message.service';
 import {
-  FeatureFlagEntity,
-  FeatureFlagKeys,
-} from 'src/engine/core-modules/feature-flag/feature-flag.entity';
-import { MessageChannelWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-channel.workspace-entity';
+  MessageChannelContactAutoCreationPolicy,
+  MessageChannelWorkspaceEntity,
+} from 'src/modules/messaging/common/standard-objects/message-channel.workspace-entity';
+import { MessageParticipantWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-participant.workspace-entity';
 import {
   GmailMessage,
   Participant,
   ParticipantWithMessageId,
 } from 'src/modules/messaging/message-import-manager/drivers/gmail/types/gmail-message';
-import { MessagingMessageService } from 'src/modules/messaging/common/services/messaging-message.service';
-import { MessagingMessageParticipantService } from 'src/modules/messaging/common/services/messaging-message-participant.service';
-import { InjectMessageQueue } from 'src/engine/integrations/message-queue/decorators/message-queue.decorator';
-import { MessageParticipantWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-participant.workspace-entity';
+import { isGroupEmail } from 'src/utils/is-group-email';
+import { isWorkEmail } from 'src/utils/is-work-email';
 
 @Injectable()
 export class MessagingSaveMessagesAndEnqueueContactCreationService {
@@ -51,18 +53,8 @@ export class MessagingSaveMessagesAndEnqueueContactCreationService {
         workspaceId,
       );
 
-    const isContactCreationForSentAndReceivedEmailsEnabledFeatureFlag =
-      await this.featureFlagRepository.findOneBy({
-        workspaceId: workspaceId,
-        key: FeatureFlagKeys.IsContactCreationForSentAndReceivedEmailsEnabled,
-        value: true,
-      });
-
     const emailAliases = connectedAccount.emailAliases?.split(',') || [];
 
-    const isContactCreationForSentAndReceivedEmailsEnabled =
-      isContactCreationForSentAndReceivedEmailsEnabledFeatureFlag?.value;
-
     let savedMessageParticipants: MessageParticipantWorkspaceEntity[] = [];
 
     const participantsWithMessageId = await workspaceDataSource?.transaction(
@@ -87,14 +79,35 @@ export class MessagingSaveMessagesAndEnqueueContactCreationService {
                   message.participants.find((p) => p.role === 'from')?.handle ||
                   '';
 
+                const isMessageSentByConnectedAccount =
+                  emailAliases.includes(fromHandle);
+
+                const isParticipantConnectedAccount = emailAliases.includes(
+                  participant.handle,
+                );
+
+                const isExcludedByNonProfessionalEmails =
+                  messageChannel.excludeNonProfessionalEmails &&
+                  !isWorkEmail(participant.handle);
+
+                const isExcludedByGroupEmails =
+                  messageChannel.excludeGroupEmails &&
+                  isGroupEmail(participant.handle);
+
+                const shouldCreateContact =
+                  !isParticipantConnectedAccount &&
+                  !isExcludedByNonProfessionalEmails &&
+                  !isExcludedByGroupEmails &&
+                  (messageChannel.contactAutoCreationPolicy ===
+                    MessageChannelContactAutoCreationPolicy.SENT_AND_RECEIVED ||
+                    (messageChannel.contactAutoCreationPolicy ===
+                      MessageChannelContactAutoCreationPolicy.SENT &&
+                      isMessageSentByConnectedAccount));
+
                 return {
                   ...participant,
                   messageId,
-                  shouldCreateContact:
-                    messageChannel.isContactAutoCreationEnabled &&
-                    (isContactCreationForSentAndReceivedEmailsEnabled ||
-                      emailAliases.includes(fromHandle)) &&
-                    !emailAliases.includes(participant.handle),
+                  shouldCreateContact,
                 };
               })
             : [];
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/services/messaging-gmail-messages-import.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/services/messaging-gmail-messages-import.service.ts
index 74236f4e91..9d7798d628 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/services/messaging-gmail-messages-import.service.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/services/messaging-gmail-messages-import.service.ts
@@ -1,29 +1,29 @@
 import { Injectable, Logger } from '@nestjs/common';
 
-import { ConnectedAccountWorkspaceEntity } from 'src/modules/connected-account/standard-objects/connected-account.workspace-entity';
+import { FeatureFlagKeys } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
+import { IsFeatureEnabledService } from 'src/engine/core-modules/feature-flag/services/is-feature-enabled.service';
+import { CacheStorageService } from 'src/engine/integrations/cache-storage/cache-storage.service';
 import { InjectCacheStorage } from 'src/engine/integrations/cache-storage/decorators/cache-storage.decorator';
 import { CacheStorageNamespace } from 'src/engine/integrations/cache-storage/types/cache-storage-namespace.enum';
-import { CacheStorageService } from 'src/engine/integrations/cache-storage/cache-storage.service';
+import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
+import { EmailAliasManagerService } from 'src/modules/connected-account/email-alias-manager/services/email-alias-manager.service';
+import { BlocklistRepository } from 'src/modules/connected-account/repositories/blocklist.repository';
+import { ConnectedAccountRepository } from 'src/modules/connected-account/repositories/connected-account.repository';
 import { GoogleAPIRefreshAccessTokenService } from 'src/modules/connected-account/services/google-api-refresh-access-token/google-api-refresh-access-token.service';
 import { BlocklistWorkspaceEntity } from 'src/modules/connected-account/standard-objects/blocklist.workspace-entity';
-import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
-import { BlocklistRepository } from 'src/modules/connected-account/repositories/blocklist.repository';
-import { MessagingTelemetryService } from 'src/modules/messaging/common/services/messaging-telemetry.service';
-import {
-  MessageChannelWorkspaceEntity,
-  MessageChannelSyncStage,
-} from 'src/modules/messaging/common/standard-objects/message-channel.workspace-entity';
-import { filterEmails } from 'src/modules/messaging/message-import-manager/utils/filter-emails.util';
+import { ConnectedAccountWorkspaceEntity } from 'src/modules/connected-account/standard-objects/connected-account.workspace-entity';
+import { MessageChannelRepository } from 'src/modules/messaging/common/repositories/message-channel.repository';
 import { MessagingChannelSyncStatusService } from 'src/modules/messaging/common/services/messaging-channel-sync-status.service';
-import { MESSAGING_GMAIL_USERS_MESSAGES_GET_BATCH_SIZE } from 'src/modules/messaging/message-import-manager/drivers/gmail/constants/messaging-gmail-users-messages-get-batch-size.constant';
-import { MessagingGmailFetchMessagesByBatchesService } from 'src/modules/messaging/message-import-manager/drivers/gmail/services/messaging-gmail-fetch-messages-by-batches.service';
 import { MessagingErrorHandlingService } from 'src/modules/messaging/common/services/messaging-error-handling.service';
 import { MessagingSaveMessagesAndEnqueueContactCreationService } from 'src/modules/messaging/common/services/messaging-save-messages-and-enqueue-contact-creation.service';
-import { MessageChannelRepository } from 'src/modules/messaging/common/repositories/message-channel.repository';
-import { EmailAliasManagerService } from 'src/modules/connected-account/email-alias-manager/services/email-alias-manager.service';
-import { IsFeatureEnabledService } from 'src/engine/core-modules/feature-flag/services/is-feature-enabled.service';
-import { FeatureFlagKeys } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
-import { ConnectedAccountRepository } from 'src/modules/connected-account/repositories/connected-account.repository';
+import { MessagingTelemetryService } from 'src/modules/messaging/common/services/messaging-telemetry.service';
+import {
+  MessageChannelSyncStage,
+  MessageChannelWorkspaceEntity,
+} from 'src/modules/messaging/common/standard-objects/message-channel.workspace-entity';
+import { MESSAGING_GMAIL_USERS_MESSAGES_GET_BATCH_SIZE } from 'src/modules/messaging/message-import-manager/drivers/gmail/constants/messaging-gmail-users-messages-get-batch-size.constant';
+import { MessagingGmailFetchMessagesByBatchesService } from 'src/modules/messaging/message-import-manager/drivers/gmail/services/messaging-gmail-fetch-messages-by-batches.service';
+import { filterEmails } from 'src/modules/messaging/message-import-manager/utils/filter-emails.util';
 
 @Injectable()
 export class MessagingGmailMessagesImportService {
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/utils/filter-emails.util.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/utils/filter-emails.util.ts
index 3bd9819f27..b1ecab0822 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/utils/filter-emails.util.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/utils/filter-emails.util.ts
@@ -9,7 +9,7 @@ export const filterEmails = (
 ) => {
   return filterOutBlocklistedMessages(
     messageChannelHandle,
-    filterOutIcsAttachments(filterOutNonPersonalEmails(messages)),
+    filterOutIcsAttachments(messages),
     blocklist,
   );
 };
@@ -46,22 +46,3 @@ const filterOutIcsAttachments = (messages: GmailMessage[]) => {
     );
   });
 };
-
-const isPersonEmail = (email: string): boolean => {
-  const nonPersonalPattern =
-    /noreply|no-reply|do_not_reply|no\.reply|^(info@|contact@|hello@|support@|feedback@|service@|help@|invites@|invite@|welcome@|alerts@|team@|notifications@|notification@|news@)/;
-
-  return !nonPersonalPattern.test(email);
-};
-
-const filterOutNonPersonalEmails = (messages: GmailMessage[]) => {
-  return messages.filter((message) => {
-    if (!message.participants) {
-      return true;
-    }
-
-    return message.participants.every((participant) =>
-      isPersonEmail(participant.handle),
-    );
-  });
-};
diff --git a/packages/twenty-server/src/modules/messaging/message-participants-manager/jobs/messaging-create-company-and-contact-after-sync.job.ts b/packages/twenty-server/src/modules/messaging/message-participants-manager/jobs/messaging-create-company-and-contact-after-sync.job.ts
index 2091db8690..53507d747f 100644
--- a/packages/twenty-server/src/modules/messaging/message-participants-manager/jobs/messaging-create-company-and-contact-after-sync.job.ts
+++ b/packages/twenty-server/src/modules/messaging/message-participants-manager/jobs/messaging-create-company-and-contact-after-sync.job.ts
@@ -3,21 +3,21 @@ import { InjectRepository } from '@nestjs/typeorm';
 
 import { Repository } from 'typeorm';
 
-import {
-  FeatureFlagEntity,
-  FeatureFlagKeys,
-} from 'src/engine/core-modules/feature-flag/feature-flag.entity';
-import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
-import { CreateCompanyAndContactService } from 'src/modules/connected-account/auto-companies-and-contacts-creation/services/create-company-and-contact.service';
-import { MessageChannelRepository } from 'src/modules/messaging/common/repositories/message-channel.repository';
-import { MessageParticipantRepository } from 'src/modules/messaging/common/repositories/message-participant.repository';
-import { MessageChannelWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-channel.workspace-entity';
-import { MessageParticipantWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-participant.workspace-entity';
+import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
 import { Process } from 'src/engine/integrations/message-queue/decorators/process.decorator';
 import { Processor } from 'src/engine/integrations/message-queue/decorators/processor.decorator';
 import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
+import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
+import { CreateCompanyAndContactService } from 'src/modules/connected-account/auto-companies-and-contacts-creation/services/create-company-and-contact.service';
 import { ConnectedAccountRepository } from 'src/modules/connected-account/repositories/connected-account.repository';
 import { ConnectedAccountWorkspaceEntity } from 'src/modules/connected-account/standard-objects/connected-account.workspace-entity';
+import { MessageChannelRepository } from 'src/modules/messaging/common/repositories/message-channel.repository';
+import { MessageParticipantRepository } from 'src/modules/messaging/common/repositories/message-participant.repository';
+import {
+  MessageChannelContactAutoCreationPolicy,
+  MessageChannelWorkspaceEntity,
+} from 'src/modules/messaging/common/standard-objects/message-channel.workspace-entity';
+import { MessageParticipantWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-participant.workspace-entity';
 
 export type MessagingCreateCompanyAndContactAfterSyncJobData = {
   workspaceId: string;
@@ -55,10 +55,11 @@ export class MessagingCreateCompanyAndContactAfterSyncJob {
       workspaceId,
     );
 
-    const { isContactAutoCreationEnabled, connectedAccountId } =
-      messageChannel[0];
+    const { contactAutoCreationPolicy, connectedAccountId } = messageChannel[0];
 
-    if (!isContactAutoCreationEnabled) {
+    if (
+      contactAutoCreationPolicy === MessageChannelContactAutoCreationPolicy.NONE
+    ) {
       return;
     }
 
@@ -73,25 +74,17 @@ export class MessagingCreateCompanyAndContactAfterSyncJob {
       );
     }
 
-    const isContactCreationForSentAndReceivedEmailsEnabledFeatureFlag =
-      await this.featureFlagRepository.findOneBy({
-        workspaceId: workspaceId,
-        key: FeatureFlagKeys.IsContactCreationForSentAndReceivedEmailsEnabled,
-        value: true,
-      });
-
-    const isContactCreationForSentAndReceivedEmailsEnabled =
-      isContactCreationForSentAndReceivedEmailsEnabledFeatureFlag?.value;
-
-    const contactsToCreate = isContactCreationForSentAndReceivedEmailsEnabled
-      ? await this.messageParticipantRepository.getByMessageChannelIdWithoutPersonIdAndWorkspaceMemberId(
-          messageChannelId,
-          workspaceId,
-        )
-      : await this.messageParticipantRepository.getByMessageChannelIdWithoutPersonIdAndWorkspaceMemberIdAndMessageOutgoing(
-          messageChannelId,
-          workspaceId,
-        );
+    const contactsToCreate =
+      contactAutoCreationPolicy ===
+      MessageChannelContactAutoCreationPolicy.SENT_AND_RECEIVED
+        ? await this.messageParticipantRepository.getByMessageChannelIdWithoutPersonIdAndWorkspaceMemberId(
+            messageChannelId,
+            workspaceId,
+          )
+        : await this.messageParticipantRepository.getByMessageChannelIdWithoutPersonIdAndWorkspaceMemberIdAndMessageOutgoing(
+            messageChannelId,
+            workspaceId,
+          );
 
     await this.createCompanyAndContactService.createCompaniesAndContactsAndUpdateParticipants(
       connectedAccount,
diff --git a/packages/twenty-server/src/utils/is-group-email.ts b/packages/twenty-server/src/utils/is-group-email.ts
new file mode 100644
index 0000000000..748495138b
--- /dev/null
+++ b/packages/twenty-server/src/utils/is-group-email.ts
@@ -0,0 +1,6 @@
+export const isGroupEmail = (email: string): boolean => {
+  const isGroupPattern =
+    /noreply|no-reply|do_not_reply|no\.reply|^(info@|contact@|hello@|support@|feedback@|service@|help@|invites@|invite@|welcome@|alerts@|team@|notifications@|notification@|news@)/;
+
+  return isGroupPattern.test(email);
+};