diff --git a/packages/twenty-front/src/modules/activities/emails/components/EmailThreadNotShared.tsx b/packages/twenty-front/src/modules/activities/emails/components/EmailThreadNotShared.tsx
index 60d5cb1d0..07dc6a775 100644
--- a/packages/twenty-front/src/modules/activities/emails/components/EmailThreadNotShared.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/components/EmailThreadNotShared.tsx
@@ -11,8 +11,7 @@ const StyledContainer = styled.div<{ isCompact?: boolean }>`
   height: 20px;
   margin-left: auto;
   width: ${({ isCompact }) => (isCompact ? 'auto' : '100%')};
-  min-width: ${({ theme }) =>
-    `calc(${theme.icon.size.md} + ${theme.spacing(2)})`};
+  min-width: ${({ theme }) => `${theme.spacing(21)}`};
   padding: ${({ theme }) => theme.spacing(0, 1)};
 
   border-radius: 4px;
@@ -21,6 +20,8 @@ const StyledContainer = styled.div<{ isCompact?: boolean }>`
 
   color: ${({ theme }) => theme.font.color.tertiary};
   font-weight: ${({ theme }) => theme.font.weight.regular};
+  font-size: ${({ theme }) => theme.font.size.sm};
+  flex: 1;
 `;
 
 type EmailThreadNotSharedProps = {
@@ -37,8 +38,8 @@ export const EmailThreadNotShared = ({
   return (
     <>
       <StyledContainer id={containerId} isCompact={isCompact}>
-        <IconLock size={theme.icon.size.md} />
-        {visibility === MessageChannelVisibility.METADATA && 'Not shared'}
+        <IconLock size={theme.icon.size.sm} />
+        {'Not shared'}
       </StyledContainer>
       {visibility === MessageChannelVisibility.SUBJECT && (
         <AppTooltip
diff --git a/packages/twenty-front/src/modules/activities/emails/components/EmailThreadPreview.tsx b/packages/twenty-front/src/modules/activities/emails/components/EmailThreadPreview.tsx
index 092386e3b..b1704074d 100644
--- a/packages/twenty-front/src/modules/activities/emails/components/EmailThreadPreview.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/components/EmailThreadPreview.tsx
@@ -44,14 +44,11 @@ const StyledSubjectAndBody = styled.div`
   overflow: hidden;
 `;
 
-const StyledSubject = styled.span<{ flex: number }>`
+const StyledSubject = styled.span`
   color: ${({ theme }) => theme.font.color.primary};
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
-  flex-shrink: 0;
-  flex: ${({ flex }) => flex};
-  max-width: max-content;
 `;
 
 const StyledBody = styled.span`
@@ -59,6 +56,7 @@ const StyledBody = styled.span`
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
+  flex: 1;
 `;
 
 const StyledReceivedAt = styled.div`
@@ -145,20 +143,20 @@ export const EmailThreadPreview = ({ thread }: EmailThreadPreviewProps) => {
       </StyledHeading>
 
       <StyledSubjectAndBody>
-        {visibility !== MessageChannelVisibility.METADATA && (
-          <StyledSubject
-            flex={
-              visibility === MessageChannelVisibility.SHARE_EVERYTHING ? 0 : 1
-            }
-          >
-            {thread.subject}
-          </StyledSubject>
+        {visibility === MessageChannelVisibility.METADATA && (
+          <EmailThreadNotShared visibility={visibility} />
+        )}
+        {visibility === MessageChannelVisibility.SUBJECT && (
+          <>
+            <StyledSubject>{thread.subject}</StyledSubject>
+            <EmailThreadNotShared visibility={visibility} />
+          </>
         )}
         {visibility === MessageChannelVisibility.SHARE_EVERYTHING && (
-          <StyledBody>{thread.lastMessageBody}</StyledBody>
-        )}
-        {visibility !== MessageChannelVisibility.SHARE_EVERYTHING && (
-          <EmailThreadNotShared visibility={visibility} />
+          <>
+            <StyledSubject>{thread.subject}</StyledSubject>
+            <StyledBody>{thread.lastMessageBody}</StyledBody>
+          </>
         )}
       </StyledSubjectAndBody>
       <StyledReceivedAt>