From aff2e80ea9e54a1002b72dbb6a3d56e163cdc8fa Mon Sep 17 00:00:00 2001
From: Elena Willen <elena.willen@infomaniak.com>
Date: Tue, 3 Jan 2023 15:03:03 +0100
Subject: [PATCH 01/12] refactor(MailTextStyle): Header1

---
 Mail/Views/NoMailboxView.swift     | 2 +-
 MailCore/Utils/MailTextStyle.swift | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Mail/Views/NoMailboxView.swift b/Mail/Views/NoMailboxView.swift
index fde24b697..ab7ea98f1 100644
--- a/Mail/Views/NoMailboxView.swift
+++ b/Mail/Views/NoMailboxView.swift
@@ -30,7 +30,7 @@ struct NoMailboxView: View {
                 .frame(width: 110, height: 110)
                 .padding(.bottom, 56)
             Text(MailResourcesStrings.Localizable.noMailboxTitle)
-                .textStyle(.header1)
+                .textStyle(.header2)
                 .padding(.horizontal, 48)
                 .padding(.bottom, 16)
             Text(MailResourcesStrings.Localizable.noMailboxDescription)
diff --git a/MailCore/Utils/MailTextStyle.swift b/MailCore/Utils/MailTextStyle.swift
index e5006f8f2..4ad28a7ad 100644
--- a/MailCore/Utils/MailTextStyle.swift
+++ b/MailCore/Utils/MailTextStyle.swift
@@ -56,7 +56,7 @@ public struct MailTextStyle {
     }
 
     public static let header1 = MailTextStyle(
-        font: .system(size: 21.5, weight: .bold),
+        font: .system(size: 22, weight: .semibold),
         color: MailResourcesAsset.primaryTextColor
     )
 

From d659e47d1e92170bc5d15effbffda8197dcda6fa Mon Sep 17 00:00:00 2001
From: Elena Willen <elena.willen@infomaniak.com>
Date: Tue, 3 Jan 2023 15:03:25 +0100
Subject: [PATCH 02/12] refactor(MailTextStyle): Header2

---
 MailCore/Utils/MailTextStyle.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MailCore/Utils/MailTextStyle.swift b/MailCore/Utils/MailTextStyle.swift
index 4ad28a7ad..583312612 100644
--- a/MailCore/Utils/MailTextStyle.swift
+++ b/MailCore/Utils/MailTextStyle.swift
@@ -61,7 +61,7 @@ public struct MailTextStyle {
     )
 
     public static let header2 = MailTextStyle(
-        font: .system(size: 17.5, weight: .bold),
+        font: .system(size: 18, weight: .semibold),
         color: MailResourcesAsset.primaryTextColor
     )
 

From 0c4803dd79e9669a798c8ca18bab0f2a0e94c91a Mon Sep 17 00:00:00 2001
From: Elena Willen <elena.willen@infomaniak.com>
Date: Tue, 3 Jan 2023 16:15:12 +0100
Subject: [PATCH 03/12] refactor(MailTextStyle): Remove header3

---
 Mail/Views/Menu Drawer/MailboxQuotaView.swift | 11 ++---------
 Mail/Views/Switch User/AccountView.swift      |  2 +-
 Mail/Views/TextStylePreview.swift             |  4 ----
 MailCore/Utils/MailTextStyle.swift            |  9 ---------
 4 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/Mail/Views/Menu Drawer/MailboxQuotaView.swift b/Mail/Views/Menu Drawer/MailboxQuotaView.swift
index 76141d377..8b395cb45 100644
--- a/Mail/Views/Menu Drawer/MailboxQuotaView.swift	
+++ b/Mail/Views/Menu Drawer/MailboxQuotaView.swift	
@@ -25,18 +25,11 @@ struct MailboxQuotaView: View {
     @EnvironmentObject var globalSheet: GlobalBottomSheet
 
     let quotas: Quotas
-    var progressString: AttributedString {
-        let localizedText = MailResourcesStrings.Localizable.menuDrawerMailboxStorage(
+    var progressString: String {
+        return MailResourcesStrings.Localizable.menuDrawerMailboxStorage(
             Int64(quotas.size * 1000).formatted(.defaultByteCount),
             Constants.sizeLimit.formatted(.defaultByteCount)
         )
-
-        var attributedString = AttributedString(localizedText)
-        if let lastWord = localizedText.split(separator: " ").last, let range = attributedString.range(of: lastWord) {
-            attributedString[range].font = MailTextStyle.header3.font
-        }
-
-        return attributedString
     }
 
     var body: some View {
diff --git a/Mail/Views/Switch User/AccountView.swift b/Mail/Views/Switch User/AccountView.swift
index 60e8c43d3..9575a11c0 100644
--- a/Mail/Views/Switch User/AccountView.swift	
+++ b/Mail/Views/Switch User/AccountView.swift	
@@ -81,7 +81,7 @@ struct AccountView: View {
 
                     VStack(spacing: 8) {
                         Text(account.user.email)
-                            .textStyle(.header3)
+                            .textStyle(.header2)
 
                         NavigationLink {
                             AccountListView()
diff --git a/Mail/Views/TextStylePreview.swift b/Mail/Views/TextStylePreview.swift
index 024c8771f..2c0147701 100644
--- a/Mail/Views/TextStylePreview.swift
+++ b/Mail/Views/TextStylePreview.swift
@@ -28,10 +28,6 @@ struct TextStylePreview: View {
                         .textStyle(.header1)
                     Text("Header 2")
                         .textStyle(.header2)
-                    Text("Header 3")
-                        .textStyle(.header3)
-                    Text("Header 3 secondary")
-                        .textStyle(.header3Secondary)
                     Text("Body")
                         .textStyle(.body)
                     Text("Body secondary")
diff --git a/MailCore/Utils/MailTextStyle.swift b/MailCore/Utils/MailTextStyle.swift
index 583312612..422b9ccd3 100644
--- a/MailCore/Utils/MailTextStyle.swift
+++ b/MailCore/Utils/MailTextStyle.swift
@@ -65,15 +65,6 @@ public struct MailTextStyle {
         color: MailResourcesAsset.primaryTextColor
     )
 
-    public static let header3 = MailTextStyle(
-        font: .system(size: 17.5),
-        color: MailResourcesAsset.primaryTextColor
-    )
-
-    public static let header3Secondary = MailTextStyle(
-        font: .system(size: 17.5),
-        color: MailResourcesAsset.secondaryTextColor
-    )
 
     public static let header4 = MailTextStyle(
         font: .system(size: 15.5, weight: .bold),

From 62d04e9f5aacb28365633639d10a8ac4c9f12ac6 Mon Sep 17 00:00:00 2001
From: Elena Willen <elena.willen@infomaniak.com>
Date: Tue, 3 Jan 2023 16:16:57 +0100
Subject: [PATCH 04/12] refactor(MailTextStyle): Remove header4

---
 Mail/Views/Bottom sheets/CreateFolderView.swift         | 2 +-
 Mail/Views/Bottom sheets/MoreStorageView.swift          | 2 +-
 Mail/Views/Bottom sheets/MoveEmailView.swift            | 2 +-
 Mail/Views/Bottom sheets/ReportDisplayProblemView.swift | 2 +-
 Mail/Views/Bottom sheets/ReportPhishingView.swift       | 2 +-
 Mail/Views/Bottom sheets/RestoreEmailsView.swift        | 2 +-
 Mail/Views/Switch User/AccountCellView.swift            | 2 +-
 MailCore/Utils/MailTextStyle.swift                      | 5 -----
 8 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/Mail/Views/Bottom sheets/CreateFolderView.swift b/Mail/Views/Bottom sheets/CreateFolderView.swift
index a7ee61d18..9b466b546 100644
--- a/Mail/Views/Bottom sheets/CreateFolderView.swift	
+++ b/Mail/Views/Bottom sheets/CreateFolderView.swift	
@@ -62,7 +62,7 @@ struct CreateFolderView: View {
             // Header
             Text(MailResourcesStrings.Localizable.createFolderTitle)
                 .frame(maxWidth: .infinity, alignment: .leading)
-                .textStyle(.header4)
+                .textStyle(.header5)
             // Text field
             TextField(MailResourcesStrings.Localizable.createFolderName, text: $folderName)
                 .padding(12)
diff --git a/Mail/Views/Bottom sheets/MoreStorageView.swift b/Mail/Views/Bottom sheets/MoreStorageView.swift
index e81b1a63b..282af8d82 100644
--- a/Mail/Views/Bottom sheets/MoreStorageView.swift	
+++ b/Mail/Views/Bottom sheets/MoreStorageView.swift	
@@ -26,7 +26,7 @@ struct MoreStorageView: View {
     var body: some View {
         VStack(alignment: .leading) {
             Text(MailResourcesStrings.Localizable.moreStorageTitle)
-                .textStyle(.header4)
+                .textStyle(.header5)
 
             Image(resource: MailResourcesAsset.moreStorage)
                 .resizable()
diff --git a/Mail/Views/Bottom sheets/MoveEmailView.swift b/Mail/Views/Bottom sheets/MoveEmailView.swift
index 04a5fb630..8f94eee5d 100644
--- a/Mail/Views/Bottom sheets/MoveEmailView.swift	
+++ b/Mail/Views/Bottom sheets/MoveEmailView.swift	
@@ -58,7 +58,7 @@ struct MoveEmailView: View {
         VStack(alignment: .trailing, spacing: 24) {
             Text(MailResourcesStrings.Localizable.moveTitle)
                 .frame(maxWidth: .infinity, alignment: .leading)
-                .textStyle(.header4)
+                .textStyle(.header5)
             Image(resource: MailResourcesAsset.moveIllu)
                 .resizable()
                 .scaledToFit()
diff --git a/Mail/Views/Bottom sheets/ReportDisplayProblemView.swift b/Mail/Views/Bottom sheets/ReportDisplayProblemView.swift
index dbd51f879..67ec96437 100644
--- a/Mail/Views/Bottom sheets/ReportDisplayProblemView.swift	
+++ b/Mail/Views/Bottom sheets/ReportDisplayProblemView.swift	
@@ -30,7 +30,7 @@ struct ReportDisplayProblemView: View {
     var body: some View {
         VStack(spacing: 16) {
             Text(MailResourcesStrings.Localizable.reportDisplayProblemTitle)
-                .textStyle(.header4)
+                .textStyle(.header5)
                 .frame(maxWidth: .infinity, alignment: .leading)
             Image(resource: MailResourcesAsset.displayIssue)
             Text(MailResourcesStrings.Localizable.reportDisplayProblemDescription)
diff --git a/Mail/Views/Bottom sheets/ReportPhishingView.swift b/Mail/Views/Bottom sheets/ReportPhishingView.swift
index 544057175..c4fc59be3 100644
--- a/Mail/Views/Bottom sheets/ReportPhishingView.swift	
+++ b/Mail/Views/Bottom sheets/ReportPhishingView.swift	
@@ -29,7 +29,7 @@ struct ReportPhishingView: View {
     var body: some View {
         VStack(spacing: 16) {
             Text(MailResourcesStrings.Localizable.reportPhishingTitle)
-                .textStyle(.header4)
+                .textStyle(.header5)
                 .frame(maxWidth: .infinity, alignment: .leading)
             Image(resource: MailResourcesAsset.phishing)
             Text(MailResourcesStrings.Localizable.reportPhishingDescription)
diff --git a/Mail/Views/Bottom sheets/RestoreEmailsView.swift b/Mail/Views/Bottom sheets/RestoreEmailsView.swift
index 4cd12ad77..96fbf52e8 100644
--- a/Mail/Views/Bottom sheets/RestoreEmailsView.swift	
+++ b/Mail/Views/Bottom sheets/RestoreEmailsView.swift	
@@ -33,7 +33,7 @@ struct RestoreEmailsView: View {
     var body: some View {
         VStack(alignment: .leading) {
             Text(MailResourcesStrings.Localizable.restoreEmailsTitle)
-                .textStyle(.header4)
+                .textStyle(.header5)
                 .padding(.bottom, 16)
 
             Text(MailResourcesStrings.Localizable.restoreEmailsText)
diff --git a/Mail/Views/Switch User/AccountCellView.swift b/Mail/Views/Switch User/AccountCellView.swift
index 408fb0fcb..804267005 100644
--- a/Mail/Views/Switch User/AccountCellView.swift	
+++ b/Mail/Views/Switch User/AccountCellView.swift	
@@ -79,7 +79,7 @@ struct AccountHeaderCell: View {
 
             VStack(alignment: .leading, spacing: 2) {
                 Text(account.user.displayName)
-                    .textStyle(.header4)
+                    .textStyle(.header5)
                 Text(account.user.email)
                     .textStyle(.callout)
             }
diff --git a/MailCore/Utils/MailTextStyle.swift b/MailCore/Utils/MailTextStyle.swift
index 422b9ccd3..4d586e850 100644
--- a/MailCore/Utils/MailTextStyle.swift
+++ b/MailCore/Utils/MailTextStyle.swift
@@ -66,11 +66,6 @@ public struct MailTextStyle {
     )
 
 
-    public static let header4 = MailTextStyle(
-        font: .system(size: 15.5, weight: .bold),
-        color: MailResourcesAsset.primaryTextColor
-    )
-
     public static let header5 = MailTextStyle(
         font: .system(size: 15.5, weight: .medium),
         color: MailResourcesAsset.primaryTextColor

From 605712430edf6d96ec017c5b467f0c5fa659e265 Mon Sep 17 00:00:00 2001
From: Elena Willen <elena.willen@infomaniak.com>
Date: Tue, 3 Jan 2023 16:52:26 +0100
Subject: [PATCH 05/12] refactor(MailTextStyle): Change header5 for bodyMedium

---
 Mail/Components/ThreadCell.swift                        | 2 +-
 Mail/Views/Bottom sheets/Actions/ActionsView.swift      | 2 +-
 Mail/Views/Bottom sheets/AddLinkView.swift              | 2 +-
 Mail/Views/Bottom sheets/ContactActionsView.swift       | 2 +-
 Mail/Views/Bottom sheets/CreateFolderView.swift         | 2 +-
 Mail/Views/Bottom sheets/LogoutConfirmationView.swift   | 2 +-
 Mail/Views/Bottom sheets/MoreStorageView.swift          | 2 +-
 Mail/Views/Bottom sheets/MoveEmailView.swift            | 2 +-
 Mail/Views/Bottom sheets/ReportDisplayProblemView.swift | 2 +-
 Mail/Views/Bottom sheets/ReportPhishingView.swift       | 2 +-
 Mail/Views/Bottom sheets/RestoreEmailsView.swift        | 2 +-
 Mail/Views/Menu Drawer/Folders/FolderCell.swift         | 2 +-
 Mail/Views/Menu Drawer/Items/MenuDrawerItemCell.swift   | 2 +-
 Mail/Views/Menu Drawer/MailboxQuotaView.swift           | 2 +-
 Mail/Views/Search/SearchFilterCell.swift                | 2 +-
 Mail/Views/Search/SearchFilterFolderCell.swift          | 2 +-
 Mail/Views/Switch User/AccountCellView.swift            | 2 +-
 Mail/Views/Thread/MessageHeaderSummaryView.swift        | 2 +-
 MailCore/Utils/MailTextStyle.swift                      | 7 +++----
 19 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/Mail/Components/ThreadCell.swift b/Mail/Components/ThreadCell.swift
index 883a1c607..c06dceb37 100644
--- a/Mail/Components/ThreadCell.swift
+++ b/Mail/Components/ThreadCell.swift
@@ -125,7 +125,7 @@ struct ThreadCell: View {
                     .layoutPriority(1)
             }
             Text(thread.messages.allSatisfy(\.isDraft) ? thread.formattedTo : thread.formattedFrom)
-                .textStyle(.header5)
+                .textStyle(.header2)
                 .lineLimit(1)
 
             if thread.messages.count > 1 {
diff --git a/Mail/Views/Bottom sheets/Actions/ActionsView.swift b/Mail/Views/Bottom sheets/Actions/ActionsView.swift
index 4f163f53a..72012e558 100644
--- a/Mail/Views/Bottom sheets/Actions/ActionsView.swift	
+++ b/Mail/Views/Bottom sheets/Actions/ActionsView.swift	
@@ -42,7 +42,7 @@ struct ActionsView: View {
             // Header
             Text(MailResourcesStrings.Localizable.actionsMenuTitle)
                 .frame(maxWidth: .infinity, alignment: .leading)
-                .textStyle(.header5)
+                .textStyle(.bodyMedium)
                 .padding(.horizontal, 24)
             // Quick actions
             HStack(alignment: .top, spacing: 28) {
diff --git a/Mail/Views/Bottom sheets/AddLinkView.swift b/Mail/Views/Bottom sheets/AddLinkView.swift
index c144bd59b..38fcf33e5 100644
--- a/Mail/Views/Bottom sheets/AddLinkView.swift	
+++ b/Mail/Views/Bottom sheets/AddLinkView.swift	
@@ -32,7 +32,7 @@ struct AddLinkView: View {
     var body: some View {
         VStack(alignment: .leading, spacing: 24) {
             Text(MailResourcesStrings.Localizable.urlEntryTitle)
-                .textStyle(.header5)
+                .textStyle(.bodyMedium)
             TextField(MailResourcesStrings.Localizable.urlPlaceholder, text: $url)
                 .textFieldStyle(.roundedBorder)
                 .focused($isFocused)
diff --git a/Mail/Views/Bottom sheets/ContactActionsView.swift b/Mail/Views/Bottom sheets/ContactActionsView.swift
index fe7bc673d..ccf7e841f 100644
--- a/Mail/Views/Bottom sheets/ContactActionsView.swift	
+++ b/Mail/Views/Bottom sheets/ContactActionsView.swift	
@@ -59,7 +59,7 @@ struct ContactActionsView: View {
                 RecipientImage(recipient: recipient, size: 32)
                 VStack(alignment: .leading) {
                     Text(recipient.contact?.name ?? recipient.title)
-                        .textStyle(.header5)
+                        .textStyle(.bodyMedium)
                     Text(recipient.contact?.email ?? recipient.email)
                         .textStyle(.bodySecondary)
                 }
diff --git a/Mail/Views/Bottom sheets/CreateFolderView.swift b/Mail/Views/Bottom sheets/CreateFolderView.swift
index 9b466b546..8cd1e07da 100644
--- a/Mail/Views/Bottom sheets/CreateFolderView.swift	
+++ b/Mail/Views/Bottom sheets/CreateFolderView.swift	
@@ -62,7 +62,7 @@ struct CreateFolderView: View {
             // Header
             Text(MailResourcesStrings.Localizable.createFolderTitle)
                 .frame(maxWidth: .infinity, alignment: .leading)
-                .textStyle(.header5)
+                .textStyle(.bodyMedium)
             // Text field
             TextField(MailResourcesStrings.Localizable.createFolderName, text: $folderName)
                 .padding(12)
diff --git a/Mail/Views/Bottom sheets/LogoutConfirmationView.swift b/Mail/Views/Bottom sheets/LogoutConfirmationView.swift
index e59c01b0f..37b2cc02a 100644
--- a/Mail/Views/Bottom sheets/LogoutConfirmationView.swift	
+++ b/Mail/Views/Bottom sheets/LogoutConfirmationView.swift	
@@ -32,7 +32,7 @@ struct LogoutConfirmationView: View {
     var body: some View {
         VStack(alignment: .leading, spacing: 24) {
             Text( MailResourcesStrings.Localizable.confirmLogoutTitle(account.user.email))
-                .textStyle(.header5)
+                .textStyle(.bodyMedium)
             Text(MailResourcesStrings.Localizable.confirmLogoutDescription)
                 .textStyle(.bodySecondary)
             BottomSheetButtonsView(primaryButtonTitle: MailResourcesStrings.Localizable.buttonLogout,
diff --git a/Mail/Views/Bottom sheets/MoreStorageView.swift b/Mail/Views/Bottom sheets/MoreStorageView.swift
index 282af8d82..2e41406ad 100644
--- a/Mail/Views/Bottom sheets/MoreStorageView.swift	
+++ b/Mail/Views/Bottom sheets/MoreStorageView.swift	
@@ -26,7 +26,7 @@ struct MoreStorageView: View {
     var body: some View {
         VStack(alignment: .leading) {
             Text(MailResourcesStrings.Localizable.moreStorageTitle)
-                .textStyle(.header5)
+                .textStyle(.bodyMedium)
 
             Image(resource: MailResourcesAsset.moreStorage)
                 .resizable()
diff --git a/Mail/Views/Bottom sheets/MoveEmailView.swift b/Mail/Views/Bottom sheets/MoveEmailView.swift
index 8f94eee5d..a62e88896 100644
--- a/Mail/Views/Bottom sheets/MoveEmailView.swift	
+++ b/Mail/Views/Bottom sheets/MoveEmailView.swift	
@@ -58,7 +58,7 @@ struct MoveEmailView: View {
         VStack(alignment: .trailing, spacing: 24) {
             Text(MailResourcesStrings.Localizable.moveTitle)
                 .frame(maxWidth: .infinity, alignment: .leading)
-                .textStyle(.header5)
+                .textStyle(.bodyMedium)
             Image(resource: MailResourcesAsset.moveIllu)
                 .resizable()
                 .scaledToFit()
diff --git a/Mail/Views/Bottom sheets/ReportDisplayProblemView.swift b/Mail/Views/Bottom sheets/ReportDisplayProblemView.swift
index 67ec96437..c4c0cc771 100644
--- a/Mail/Views/Bottom sheets/ReportDisplayProblemView.swift	
+++ b/Mail/Views/Bottom sheets/ReportDisplayProblemView.swift	
@@ -30,7 +30,7 @@ struct ReportDisplayProblemView: View {
     var body: some View {
         VStack(spacing: 16) {
             Text(MailResourcesStrings.Localizable.reportDisplayProblemTitle)
-                .textStyle(.header5)
+                .textStyle(.bodyMedium)
                 .frame(maxWidth: .infinity, alignment: .leading)
             Image(resource: MailResourcesAsset.displayIssue)
             Text(MailResourcesStrings.Localizable.reportDisplayProblemDescription)
diff --git a/Mail/Views/Bottom sheets/ReportPhishingView.swift b/Mail/Views/Bottom sheets/ReportPhishingView.swift
index c4fc59be3..5d446264b 100644
--- a/Mail/Views/Bottom sheets/ReportPhishingView.swift	
+++ b/Mail/Views/Bottom sheets/ReportPhishingView.swift	
@@ -29,7 +29,7 @@ struct ReportPhishingView: View {
     var body: some View {
         VStack(spacing: 16) {
             Text(MailResourcesStrings.Localizable.reportPhishingTitle)
-                .textStyle(.header5)
+                .textStyle(.bodyMedium)
                 .frame(maxWidth: .infinity, alignment: .leading)
             Image(resource: MailResourcesAsset.phishing)
             Text(MailResourcesStrings.Localizable.reportPhishingDescription)
diff --git a/Mail/Views/Bottom sheets/RestoreEmailsView.swift b/Mail/Views/Bottom sheets/RestoreEmailsView.swift
index 96fbf52e8..b691bed3d 100644
--- a/Mail/Views/Bottom sheets/RestoreEmailsView.swift	
+++ b/Mail/Views/Bottom sheets/RestoreEmailsView.swift	
@@ -33,7 +33,7 @@ struct RestoreEmailsView: View {
     var body: some View {
         VStack(alignment: .leading) {
             Text(MailResourcesStrings.Localizable.restoreEmailsTitle)
-                .textStyle(.header5)
+                .textStyle(.bodyMedium)
                 .padding(.bottom, 16)
 
             Text(MailResourcesStrings.Localizable.restoreEmailsText)
diff --git a/Mail/Views/Menu Drawer/Folders/FolderCell.swift b/Mail/Views/Menu Drawer/Folders/FolderCell.swift
index ac7c7d3af..6c51dc0f3 100644
--- a/Mail/Views/Menu Drawer/Folders/FolderCell.swift	
+++ b/Mail/Views/Menu Drawer/Folders/FolderCell.swift	
@@ -78,7 +78,7 @@ struct FolderCellContent: View {
     }
 
     private var textStyle: MailTextStyle {
-        isSelected ? .header5Accent : .header5
+        isSelected ? .header5Accent : .bodyMedium
     }
 
     var body: some View {
diff --git a/Mail/Views/Menu Drawer/Items/MenuDrawerItemCell.swift b/Mail/Views/Menu Drawer/Items/MenuDrawerItemCell.swift
index 1e22c11bb..a5283b2d9 100644
--- a/Mail/Views/Menu Drawer/Items/MenuDrawerItemCell.swift	
+++ b/Mail/Views/Menu Drawer/Items/MenuDrawerItemCell.swift	
@@ -34,7 +34,7 @@ struct MenuDrawerItemCell: View {
                     .foregroundColor(.accentColor)
 
                 Text(content.label)
-                    .textStyle(.header5)
+                    .textStyle(.bodyMedium)
             }
             .frame(maxWidth: .infinity, alignment: .leading)
         }
diff --git a/Mail/Views/Menu Drawer/MailboxQuotaView.swift b/Mail/Views/Menu Drawer/MailboxQuotaView.swift
index 8b395cb45..0a01ef12b 100644
--- a/Mail/Views/Menu Drawer/MailboxQuotaView.swift	
+++ b/Mail/Views/Menu Drawer/MailboxQuotaView.swift	
@@ -40,7 +40,7 @@ struct MailboxQuotaView: View {
 
             VStack(alignment: .leading, spacing: 6) {
                 Text(progressString)
-                    .textStyle(.header5)
+                    .textStyle(.bodyMedium)
             }
 
             Spacer()
diff --git a/Mail/Views/Search/SearchFilterCell.swift b/Mail/Views/Search/SearchFilterCell.swift
index 4a6d44d29..85a922032 100644
--- a/Mail/Views/Search/SearchFilterCell.swift
+++ b/Mail/Views/Search/SearchFilterCell.swift
@@ -33,7 +33,7 @@ struct SearchFilterCell: View {
                     .frame(width: 13, height: 13)
             }
             Text(title)
-                .font(MailTextStyle.header5.font)
+                .font(MailTextStyle.bodyMedium.font)
         }
         .filterCellStyle(isSelected: isSelected)
     }
diff --git a/Mail/Views/Search/SearchFilterFolderCell.swift b/Mail/Views/Search/SearchFilterFolderCell.swift
index d5e7ea01b..65682b110 100644
--- a/Mail/Views/Search/SearchFilterFolderCell.swift
+++ b/Mail/Views/Search/SearchFilterFolderCell.swift
@@ -68,7 +68,7 @@ struct SearchFilterFolderCell: View {
                         .frame(width: 13, height: 13)
                 }
                 Text(selectedFolderName)
-                    .font(MailTextStyle.header5.font)
+                    .font(MailTextStyle.bodyMedium.font)
                 Image(resource: MailResourcesAsset.arrowDown)
                     .resizable()
                     .frame(width: 13, height: 13)
diff --git a/Mail/Views/Switch User/AccountCellView.swift b/Mail/Views/Switch User/AccountCellView.swift
index 804267005..1301c3f2b 100644
--- a/Mail/Views/Switch User/AccountCellView.swift	
+++ b/Mail/Views/Switch User/AccountCellView.swift	
@@ -79,7 +79,7 @@ struct AccountHeaderCell: View {
 
             VStack(alignment: .leading, spacing: 2) {
                 Text(account.user.displayName)
-                    .textStyle(.header5)
+                    .textStyle(.bodyMedium)
                 Text(account.user.email)
                     .textStyle(.callout)
             }
diff --git a/Mail/Views/Thread/MessageHeaderSummaryView.swift b/Mail/Views/Thread/MessageHeaderSummaryView.swift
index 2eb160f99..3217210d9 100644
--- a/Mail/Views/Thread/MessageHeaderSummaryView.swift
+++ b/Mail/Views/Thread/MessageHeaderSummaryView.swift
@@ -61,7 +61,7 @@ struct MessageHeaderSummaryView: View {
                                 ForEach(message.from, id: \.self) { recipient in
                                     Text(recipient.title)
                                         .lineLimit(1)
-                                        .textStyle(.header5)
+                                        .textStyle(.bodyMedium)
                                 }
                             }
                             Text(message.date.customRelativeFormatted)
diff --git a/MailCore/Utils/MailTextStyle.swift b/MailCore/Utils/MailTextStyle.swift
index 4d586e850..bc2595fc7 100644
--- a/MailCore/Utils/MailTextStyle.swift
+++ b/MailCore/Utils/MailTextStyle.swift
@@ -64,10 +64,9 @@ public struct MailTextStyle {
         font: .system(size: 18, weight: .semibold),
         color: MailResourcesAsset.primaryTextColor
     )
-
-
-    public static let header5 = MailTextStyle(
-        font: .system(size: 15.5, weight: .medium),
+        
+    public static let bodyMedium = MailTextStyle(
+        font: .system(size: 16, weight: .medium),
         color: MailResourcesAsset.primaryTextColor
     )
 

From 6b51c767a6c0a5ef8f0547aecedbbf171226dce0 Mon Sep 17 00:00:00 2001
From: Elena Willen <elena.willen@infomaniak.com>
Date: Wed, 4 Jan 2023 14:57:33 +0100
Subject: [PATCH 06/12] refactor(MailTextStyle): bodyMedium not primary

---
 Mail/Components/BottomSheetButton.swift            |  2 +-
 Mail/Components/FloatingActionButton.swift         |  2 +-
 Mail/Components/LargeButton.swift                  |  2 +-
 .../Bottom sheets/BottomSheetButtonsView.swift     |  2 +-
 Mail/Views/Menu Drawer/Folders/FolderCell.swift    |  2 +-
 .../MailboxesManagementView.swift                  |  2 +-
 Mail/Views/New Message/ComposeMessageView.swift    |  2 +-
 Mail/Views/NoMailboxView.swift                     |  2 +-
 Mail/Views/Onboarding/OnboardingView.swift         |  2 +-
 Mail/Views/Switch User/AccountListMailView.swift   |  2 +-
 Mail/Views/Switch User/AccountView.swift           |  4 ++--
 Mail/Views/TextStylePreview.swift                  |  8 ++++----
 Mail/Views/Thread/MessageHeaderSummaryView.swift   |  2 +-
 MailCore/Utils/MailTextStyle.swift                 | 14 +++++++-------
 .../backgroundCardColor.colorset/Contents.json     |  6 +++---
 15 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/Mail/Components/BottomSheetButton.swift b/Mail/Components/BottomSheetButton.swift
index f1cfafdc1..5b113bbe4 100644
--- a/Mail/Components/BottomSheetButton.swift
+++ b/Mail/Components/BottomSheetButton.swift
@@ -27,7 +27,7 @@ struct BottomSheetButton: View {
     var body: some View {
         Button(action: action) {
             Text(label)
-                .textStyle(.header5OnAccent)
+                .textStyle(.bodyMediumOnAccent)
                 .padding(.horizontal, 12) // Button has already a 12pt horizontal padding
                 .padding(.vertical, 11) // Button has already a 7pt vertical padding
         }
diff --git a/Mail/Components/FloatingActionButton.swift b/Mail/Components/FloatingActionButton.swift
index cf4e23383..ce8a27b40 100644
--- a/Mail/Components/FloatingActionButton.swift
+++ b/Mail/Components/FloatingActionButton.swift
@@ -29,7 +29,7 @@ struct FloatingActionButton: View {
         Button(action: action) {
             Label {
                 Text(title)
-                    .textStyle(.header5OnAccent)
+                    .textStyle(.bodyMediumOnAccent)
             } icon: {
                 icon
                     .resizable()
diff --git a/Mail/Components/LargeButton.swift b/Mail/Components/LargeButton.swift
index 53a7faa5c..80692b607 100644
--- a/Mail/Components/LargeButton.swift
+++ b/Mail/Components/LargeButton.swift
@@ -36,7 +36,7 @@ struct LargeButton<Label>: View where Label: View {
                     ProgressView()
                 } else {
                     label
-                        .textStyle(.header5OnAccent)
+                        .textStyle(.bodyMediumOnAccent)
                 }
             }
             .padding(.vertical, 10)
diff --git a/Mail/Views/Bottom sheets/BottomSheetButtonsView.swift b/Mail/Views/Bottom sheets/BottomSheetButtonsView.swift
index bd9cbde13..15e4851ca 100644
--- a/Mail/Views/Bottom sheets/BottomSheetButtonsView.swift	
+++ b/Mail/Views/Bottom sheets/BottomSheetButtonsView.swift	
@@ -39,7 +39,7 @@ struct BottomSheetButtonsView: View {
         HStack(spacing: 24) {
             Button(role: .destructive, action: secondaryButtonAction) {
                 Text(secondaryButtonTitle)
-                    .textStyle(.header5Error)
+                    .textStyle(.bodyMediumError)
             }
 
             BottomSheetButton(label: primaryButtonTitle,
diff --git a/Mail/Views/Menu Drawer/Folders/FolderCell.swift b/Mail/Views/Menu Drawer/Folders/FolderCell.swift
index 6c51dc0f3..c96d8783f 100644
--- a/Mail/Views/Menu Drawer/Folders/FolderCell.swift	
+++ b/Mail/Views/Menu Drawer/Folders/FolderCell.swift	
@@ -78,7 +78,7 @@ struct FolderCellContent: View {
     }
 
     private var textStyle: MailTextStyle {
-        isSelected ? .header5Accent : .bodyMedium
+        isSelected ? .bodyMediumAccent : .bodyMedium
     }
 
     var body: some View {
diff --git a/Mail/Views/Menu Drawer/MailboxManagement/MailboxesManagementView.swift b/Mail/Views/Menu Drawer/MailboxManagement/MailboxesManagementView.swift
index f581d9f16..d3d91955a 100644
--- a/Mail/Views/Menu Drawer/MailboxManagement/MailboxesManagementView.swift	
+++ b/Mail/Views/Menu Drawer/MailboxManagement/MailboxesManagementView.swift	
@@ -51,7 +51,7 @@ struct MailboxesManagementView: View {
                         .foregroundColor(.accentColor)
                         .padding(.trailing, 16)
                     Text(mailboxManager.mailbox.email)
-                        .textStyle(.header5Accent)
+                        .textStyle(.bodyMediumAccent)
                         .lineLimit(1)
                     Spacer()
                     ChevronIcon(style: navigationDrawerState.showMailboxes ? .up : .down, color: .primary)
diff --git a/Mail/Views/New Message/ComposeMessageView.swift b/Mail/Views/New Message/ComposeMessageView.swift
index cdf7f3285..14dfedb76 100644
--- a/Mail/Views/New Message/ComposeMessageView.swift	
+++ b/Mail/Views/New Message/ComposeMessageView.swift	
@@ -131,7 +131,7 @@ struct ComposeMessageView: View {
                         NewMessageCell(type: .from,
                                        isFirstCell: true) {
                             Text(mailboxManager.mailbox.email)
-                                .textStyle(.header5Accent)
+                                .textStyle(.bodyMediumAccent)
                         }
                     }
 
diff --git a/Mail/Views/NoMailboxView.swift b/Mail/Views/NoMailboxView.swift
index ab7ea98f1..e2a00ca6c 100644
--- a/Mail/Views/NoMailboxView.swift
+++ b/Mail/Views/NoMailboxView.swift
@@ -48,7 +48,7 @@ struct NoMailboxView: View {
                 (window?.windowScene?.delegate as? SceneDelegate)?.showLoginView()
             } label: {
                 Text(MailResourcesStrings.Localizable.buttonLogInDifferentAccount)
-                    .textStyle(.header5Accent)
+                    .textStyle(.bodyMediumAccent)
             }
         }
     }
diff --git a/Mail/Views/Onboarding/OnboardingView.swift b/Mail/Views/Onboarding/OnboardingView.swift
index 517bdcf60..18dfdcb74 100644
--- a/Mail/Views/Onboarding/OnboardingView.swift
+++ b/Mail/Views/Onboarding/OnboardingView.swift
@@ -113,7 +113,7 @@ struct OnboardingView: View {
                         showWorkInProgressSnackBar()
                     } label: {
                         Text(MailResourcesStrings.Localizable.buttonCreateAccount)
-                            .textStyle(.header5Accent)
+                            .textStyle(.bodyMediumAccent)
                     }
                 } else {
                     Button {
diff --git a/Mail/Views/Switch User/AccountListMailView.swift b/Mail/Views/Switch User/AccountListMailView.swift
index 99dbae049..2ea65dc3c 100644
--- a/Mail/Views/Switch User/AccountListMailView.swift	
+++ b/Mail/Views/Switch User/AccountListMailView.swift	
@@ -45,7 +45,7 @@ struct AccountListMailView: View {
                     .textStyle(isSelected ? .calloutMediumAccent : .calloutAccent)
             }
         }
-        .textStyle(isSelected ? .header5Accent : .body)
+        .textStyle(isSelected ? .bodyMediumAccent : .body)
         .onAppear {
             // TODO: Get unread count
         }
diff --git a/Mail/Views/Switch User/AccountView.swift b/Mail/Views/Switch User/AccountView.swift
index 9575a11c0..560f30b08 100644
--- a/Mail/Views/Switch User/AccountView.swift	
+++ b/Mail/Views/Switch User/AccountView.swift	
@@ -87,7 +87,7 @@ struct AccountView: View {
                             AccountListView()
                         } label: {
                             Text(MailResourcesStrings.Localizable.buttonAccountSwitch)
-                                .textStyle(.header5Accent)
+                                .textStyle(.bodyMediumAccent)
                         }
                     }
 
@@ -123,7 +123,7 @@ struct AccountView: View {
                     sheet.state = .deleteAccount
                 } label: {
                     Text(MailResourcesStrings.Localizable.buttonAccountDelete)
-                        .textStyle(.header5Error)
+                        .textStyle(.bodyMediumError)
                 }
             }
             .navigationBarTitle(MailResourcesStrings.Localizable.titleMyAccount, displayMode: .inline)
diff --git a/Mail/Views/TextStylePreview.swift b/Mail/Views/TextStylePreview.swift
index 2c0147701..b64b8cc06 100644
--- a/Mail/Views/TextStylePreview.swift
+++ b/Mail/Views/TextStylePreview.swift
@@ -44,13 +44,13 @@ struct TextStylePreview: View {
                 Group {
                     Text("Callout tertiary")
                         .textStyle(.calloutTertiary)
-                    Text("Header 5 accent")
-                        .textStyle(.header5Accent)
-                    Text("Header 5 on accent")
+                    Text("Body medium accent")
+                        .textStyle(.bodyMediumAccent)
+                    Text("Body medium on accent")
                         .padding()
                         .background(Color.accentColor)
                         .cornerRadius(50)
-                        .textStyle(.header5OnAccent)
+                        .textStyle(.bodyMediumOnAccent)
                 }
             }
             .navigationTitle("Text styles")
diff --git a/Mail/Views/Thread/MessageHeaderSummaryView.swift b/Mail/Views/Thread/MessageHeaderSummaryView.swift
index 3217210d9..c344080c7 100644
--- a/Mail/Views/Thread/MessageHeaderSummaryView.swift
+++ b/Mail/Views/Thread/MessageHeaderSummaryView.swift
@@ -45,7 +45,7 @@ struct MessageHeaderSummaryView: View {
                     if message.isDraft {
                         HStack {
                             Text(MailResourcesStrings.Localizable.messageIsDraftOption)
-                                .textStyle(.header5Error)
+                                .textStyle(.bodyMediumError)
                             Spacer()
                             Button(action: deleteDraftTapped) {
                                 Image(resource: MailResourcesAsset.bin)
diff --git a/MailCore/Utils/MailTextStyle.swift b/MailCore/Utils/MailTextStyle.swift
index bc2595fc7..a45ba95dd 100644
--- a/MailCore/Utils/MailTextStyle.swift
+++ b/MailCore/Utils/MailTextStyle.swift
@@ -64,24 +64,24 @@ public struct MailTextStyle {
         font: .system(size: 18, weight: .semibold),
         color: MailResourcesAsset.primaryTextColor
     )
-        
+
     public static let bodyMedium = MailTextStyle(
         font: .system(size: 16, weight: .medium),
         color: MailResourcesAsset.primaryTextColor
     )
 
-    public static let header5Accent = MailTextStyle(
-        font: .system(size: 15.5, weight: .medium),
+    public static let bodyMediumAccent = MailTextStyle(
+        font: .system(size: 16, weight: .medium),
         color: \.primary
     )
 
-    public static let header5OnAccent = MailTextStyle(
-        font: .system(size: 15.5, weight: .medium),
+    public static let bodyMediumOnAccent = MailTextStyle(
+        font: .system(size: 16, weight: .medium),
         color: MailResourcesAsset.onAccentColor
     )
 
-    public static let header5Error = MailTextStyle(
-        font: .system(size: 15.5, weight: .medium),
+    public static let bodyMediumError = MailTextStyle(
+        font: .system(size: 16, weight: .medium),
         color: MailResourcesAsset.redActionColor
     )
 
diff --git a/MailResources/Assets.xcassets/Colors/backgroundCardColor.colorset/Contents.json b/MailResources/Assets.xcassets/Colors/backgroundCardColor.colorset/Contents.json
index 6bdf676e3..ecd8d694d 100644
--- a/MailResources/Assets.xcassets/Colors/backgroundCardColor.colorset/Contents.json
+++ b/MailResources/Assets.xcassets/Colors/backgroundCardColor.colorset/Contents.json
@@ -23,9 +23,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0.102",
-          "green" : "0.102",
-          "red" : "0.102"
+          "blue" : "0x1A",
+          "green" : "0x1A",
+          "red" : "0x1A"
         }
       },
       "idiom" : "universal"

From 552159b37e7c290ed681a4635b90bb72e7692c65 Mon Sep 17 00:00:00 2001
From: Elena Willen <elena.willen@infomaniak.com>
Date: Wed, 4 Jan 2023 14:57:55 +0100
Subject: [PATCH 07/12] refactor(MailTextStyle): Body

---
 MailCore/Utils/MailTextStyle.swift | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/MailCore/Utils/MailTextStyle.swift b/MailCore/Utils/MailTextStyle.swift
index a45ba95dd..635df4cf2 100644
--- a/MailCore/Utils/MailTextStyle.swift
+++ b/MailCore/Utils/MailTextStyle.swift
@@ -86,17 +86,17 @@ public struct MailTextStyle {
     )
 
     public static let body = MailTextStyle(
-        font: .system(size: 15.5),
+        font: .system(size: 16),
         color: MailResourcesAsset.primaryTextColor
     )
 
     public static let bodySecondary = MailTextStyle(
-        font: .system(size: 15.5),
+        font: .system(size: 16),
         color: MailResourcesAsset.secondaryTextColor
     )
 
     public static let bodyError = MailTextStyle(
-        font: .system(size: 15.5),
+        font: .system(size: 16),
         color: MailResourcesAsset.redActionColor
     )
 

From 7b865cf32041113639029efc4d770efc8fdaa661 Mon Sep 17 00:00:00 2001
From: Elena Willen <elena.willen@infomaniak.com>
Date: Wed, 4 Jan 2023 17:40:33 +0100
Subject: [PATCH 08/12] refactor(MailTextStyle): Change callout to bodySmall

---
 Mail/Components/LargePicker.swift             |  2 +-
 Mail/Components/ThreadCell.swift              |  8 ++--
 Mail/Views/Menu Drawer/Actions/HelpView.swift |  2 +-
 .../Menu Drawer/Folders/FolderCell.swift      |  2 +-
 .../Folders/UserFoldersListView.swift         |  4 +-
 .../Items/MenuDrawerItemsListView.swift       |  2 +-
 .../MailboxesManagementButtonView.swift       |  2 +-
 Mail/Views/Search/SearchView.swift            |  8 ++--
 Mail/Views/Settings/SettingsOptionCell.swift  |  2 +-
 Mail/Views/Settings/SettingsOptionView.swift  |  2 +-
 .../Settings/SettingsSwipeActionsView.swift   |  2 +-
 .../SettingsThreadDensityOptionView.swift     |  2 +-
 Mail/Views/Settings/SettingsView.swift        |  2 +-
 Mail/Views/Settings/SwipeConfigCell.swift     |  2 +-
 Mail/Views/Switch User/AccountCellView.swift  |  2 +-
 .../Switch User/AccountListMailView.swift     |  2 +-
 Mail/Views/Switch User/AccountView.swift      |  2 +-
 Mail/Views/TextStylePreview.swift             | 12 +-----
 Mail/Views/Thread List/NoNetworkView.swift    |  4 +-
 Mail/Views/Thread List/ThreadListHeader.swift |  4 +-
 Mail/Views/Thread List/ThreadListView.swift   |  2 +-
 Mail/Views/Thread/AttachmentCell.swift        |  2 +-
 Mail/Views/Thread/AttachmentsView.swift       |  4 +-
 .../Thread/MessageHeaderDetailView.swift      |  6 +--
 .../Thread/MessageHeaderSummaryView.swift     |  2 +-
 MailCore/Utils/MailTextStyle.swift            | 43 ++++++++-----------
 26 files changed, 57 insertions(+), 70 deletions(-)

diff --git a/Mail/Components/LargePicker.swift b/Mail/Components/LargePicker.swift
index 5d5df3999..f95b3ed98 100644
--- a/Mail/Components/LargePicker.swift
+++ b/Mail/Components/LargePicker.swift
@@ -52,7 +52,7 @@ struct LargePicker<SelectionValue, ButtonType>: View where SelectionValue: Hasha
         VStack(alignment: .leading, spacing: 4) {
             if let title = title {
                 Text(title)
-                    .textStyle(.callout)
+                    .textStyle(.bodySmall)
             }
 
             Menu {
diff --git a/Mail/Components/ThreadCell.swift b/Mail/Components/ThreadCell.swift
index c06dceb37..bdf4b9bf6 100644
--- a/Mail/Components/ThreadCell.swift
+++ b/Mail/Components/ThreadCell.swift
@@ -130,7 +130,7 @@ struct ThreadCell: View {
 
             if thread.messages.count > 1 {
                 Text("\(thread.messages.count)")
-                    .textStyle(.calloutSecondary)
+                    .textStyle(.bodySmallSecondary)
                     .padding(.horizontal, 4)
                     .lineLimit(1)
                     .overlay {
@@ -142,7 +142,7 @@ struct ThreadCell: View {
             Spacer()
 
             Text(thread.date.customRelativeFormatted)
-                .textStyle(.calloutSecondary)
+                .textStyle(.bodySmallSecondary)
                 .lineLimit(1)
         }
     }
@@ -150,13 +150,13 @@ struct ThreadCell: View {
     private var threadInfo: some View {
         VStack(alignment: .leading, spacing: 8) {
             Text(thread.formattedSubject)
-                .textStyle(.callout)
+                .textStyle(.body)
                 .lineLimit(1)
 
             if threadDensity != .compact,
                let preview = thread.messages.last?.preview {
                 Text(preview.isEmpty ? MailResourcesStrings.Localizable.noBodyTitle : preview)
-                    .textStyle(.calloutSecondary)
+                    .textStyle(.bodySmallSecondary)
                     .lineLimit(1)
             }
         }
diff --git a/Mail/Views/Menu Drawer/Actions/HelpView.swift b/Mail/Views/Menu Drawer/Actions/HelpView.swift
index e94c1c010..ecad90616 100644
--- a/Mail/Views/Menu Drawer/Actions/HelpView.swift	
+++ b/Mail/Views/Menu Drawer/Actions/HelpView.swift	
@@ -58,7 +58,7 @@ struct HelpView: View {
                 .listRowInsets(.init())
             } header: {
                 Text(MailResourcesStrings.Localizable.helpSubtitle)
-                    .textStyle(.calloutSecondary)
+                    .textStyle(.bodySmallSecondary)
             }
             .listSectionSeparator(.hidden)
         }
diff --git a/Mail/Views/Menu Drawer/Folders/FolderCell.swift b/Mail/Views/Menu Drawer/Folders/FolderCell.swift
index c96d8783f..6cff3f350 100644
--- a/Mail/Views/Menu Drawer/Folders/FolderCell.swift	
+++ b/Mail/Views/Menu Drawer/Folders/FolderCell.swift	
@@ -96,7 +96,7 @@ struct FolderCellContent: View {
             Spacer()
 
             Text(folder.formattedUnreadCount)
-                .textStyle(isSelected ? .calloutStrongAccent : .calloutMediumAccent)
+                .textStyle(.bodySmallMediumAccent)
         }
         .padding(.vertical, Constants.menuDrawerVerticalPadding)
         .padding(.horizontal, Constants.menuDrawerHorizontalPadding)
diff --git a/Mail/Views/Menu Drawer/Folders/UserFoldersListView.swift b/Mail/Views/Menu Drawer/Folders/UserFoldersListView.swift
index af79f82bb..94a65fd22 100644
--- a/Mail/Views/Menu Drawer/Folders/UserFoldersListView.swift	
+++ b/Mail/Views/Menu Drawer/Folders/UserFoldersListView.swift	
@@ -42,7 +42,7 @@ struct UserFoldersListView: View {
                 HStack(spacing: 12) {
                     ChevronIcon(style: isExpanded ? .up : .down, color: .secondary)
                     Text(MailResourcesStrings.Localizable.buttonFolders)
-                        .textStyle(.calloutSecondary)
+                        .textStyle(.bodySmallSecondary)
                     Spacer()
                     Button {
                         globalAlert.state = .createNewFolder(mode: .create)
@@ -61,7 +61,7 @@ struct UserFoldersListView: View {
 
                 if folders.isEmpty {
                     Text(MailResourcesStrings.Localizable.noFolderTitle)
-                        .textStyle(.calloutSecondary)
+                        .textStyle(.bodySmallSecondary)
                         .padding(.top, 16)
                         .padding(.bottom, 8)
                 } else {
diff --git a/Mail/Views/Menu Drawer/Items/MenuDrawerItemsListView.swift b/Mail/Views/Menu Drawer/Items/MenuDrawerItemsListView.swift
index 9c61eff91..8d0820cc6 100644
--- a/Mail/Views/Menu Drawer/Items/MenuDrawerItemsListView.swift	
+++ b/Mail/Views/Menu Drawer/Items/MenuDrawerItemsListView.swift	
@@ -46,7 +46,7 @@ struct MenuDrawerItemsListView: View {
                     HStack(spacing: 12) {
                         ChevronIcon(style: isExpanded ? .up : .down, color: .secondary)
                         Text(title)
-                            .textStyle(.calloutSecondary)
+                            .textStyle(.bodySmallSecondary)
                         Spacer()
                     }
                 }
diff --git a/Mail/Views/Menu Drawer/MailboxManagement/MailboxesManagementButtonView.swift b/Mail/Views/Menu Drawer/MailboxManagement/MailboxesManagementButtonView.swift
index 5975e2ff7..e3904d35a 100644
--- a/Mail/Views/Menu Drawer/MailboxManagement/MailboxesManagementButtonView.swift	
+++ b/Mail/Views/Menu Drawer/MailboxManagement/MailboxesManagementButtonView.swift	
@@ -48,7 +48,7 @@ struct MailboxesManagementButtonView: View {
                 Spacer()
                 if let detailNumber = detailNumber {
                     Text(detailNumber < 100 ? "\(detailNumber)" : "99+")
-                        .textStyle(.calloutMediumAccent)
+                        .textStyle(.bodySmallMediumAccent)
                 }
             }
         }
diff --git a/Mail/Views/Search/SearchView.swift b/Mail/Views/Search/SearchView.swift
index 742492c85..aa6921dc0 100644
--- a/Mail/Views/Search/SearchView.swift
+++ b/Mail/Views/Search/SearchView.swift
@@ -82,7 +82,7 @@ struct SearchView: View {
                 Text(MailResourcesStrings.Localizable.searchNoHistoryDescription)
                     .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
                     .padding(.top, 16)
-                    .textStyle(.calloutSecondary)
+                    .textStyle(.bodySmallSecondary)
             } else {
                 List {
                     if viewModel.searchState == .history {
@@ -186,7 +186,7 @@ struct SearchView: View {
         } header: {
             if threadDensity != .compact && !threads.isEmpty {
                 Text(MailResourcesStrings.Localizable.searchAllMessages)
-                    .textStyle(.calloutSecondary)
+                    .textStyle(.bodySmallSecondary)
             }
         } footer: {
             if viewModel.isLoading {
@@ -213,7 +213,7 @@ struct SearchView: View {
         } header: {
             if !contacts.isEmpty {
                 Text(MailResourcesStrings.Localizable.contactsSearch)
-                    .textStyle(.calloutSecondary)
+                    .textStyle(.bodySmallSecondary)
             }
         }
         .listRowInsets(.init(top: 0, leading: 12, bottom: 0, trailing: 12))
@@ -250,7 +250,7 @@ struct SearchView: View {
             .padding(.horizontal, 4)
         } header: {
             Text(MailResourcesStrings.Localizable.recentSearchesTitle)
-                .textStyle(.calloutSecondary)
+                .textStyle(.bodySmallSecondary)
         }
         .listRowSeparator(.hidden)
         .listRowBackground(MailResourcesAsset.backgroundColor.swiftUiColor)
diff --git a/Mail/Views/Settings/SettingsOptionCell.swift b/Mail/Views/Settings/SettingsOptionCell.swift
index 417552380..135da4107 100644
--- a/Mail/Views/Settings/SettingsOptionCell.swift
+++ b/Mail/Views/Settings/SettingsOptionCell.swift
@@ -44,7 +44,7 @@ struct SettingsOptionCell: View {
                         Text(title)
                             .textStyle(.body)
                         Text(subtitle)
-                            .textStyle(.calloutTertiary)
+                            .textStyle(.bodySmallTertiary)
                     }
                 }
             }
diff --git a/Mail/Views/Settings/SettingsOptionView.swift b/Mail/Views/Settings/SettingsOptionView.swift
index 9cc1c4b28..f22bc3675 100644
--- a/Mail/Views/Settings/SettingsOptionView.swift
+++ b/Mail/Views/Settings/SettingsOptionView.swift
@@ -89,7 +89,7 @@ struct SettingsOptionView<OptionEnum>: View where OptionEnum: CaseIterable, Opti
             } header: {
                 if let subtitle = subtitle {
                     Text(subtitle)
-                        .textStyle(.calloutSecondary)
+                        .textStyle(.bodySmallSecondary)
                 } else {
                     EmptyView()
                 }
diff --git a/Mail/Views/Settings/SettingsSwipeActionsView.swift b/Mail/Views/Settings/SettingsSwipeActionsView.swift
index f464a010c..253f200fd 100644
--- a/Mail/Views/Settings/SettingsSwipeActionsView.swift
+++ b/Mail/Views/Settings/SettingsSwipeActionsView.swift
@@ -54,7 +54,7 @@ struct SettingsSwipeActionsView: View {
                 } header: {
                     if section == viewModel.sections.first {
                         Text(MailResourcesStrings.Localizable.settingsSwipeDescription)
-                            .textStyle(.calloutSecondary)
+                            .textStyle(.bodySmallSecondary)
                             .padding(.horizontal, 8)
                     }
                 }
diff --git a/Mail/Views/Settings/SettingsThreadDensityOptionView.swift b/Mail/Views/Settings/SettingsThreadDensityOptionView.swift
index 548c38e7c..36b41425d 100644
--- a/Mail/Views/Settings/SettingsThreadDensityOptionView.swift
+++ b/Mail/Views/Settings/SettingsThreadDensityOptionView.swift
@@ -32,7 +32,7 @@ struct SettingsThreadDensityOptionView: View {
         VStack(spacing: 16) {
             Text(MailResourcesStrings.Localizable.settingsSelectDisplayModeDescription)
                 .frame(maxWidth: .infinity, alignment: .leading)
-                .textStyle(.calloutSecondary)
+                .textStyle(.bodySmallSecondary)
                 .padding(.bottom, 8)
 
             Picker("Display mode", selection: $selectedValue.animation()) {
diff --git a/Mail/Views/Settings/SettingsView.swift b/Mail/Views/Settings/SettingsView.swift
index c5ca5f4f7..2ba32a7cd 100644
--- a/Mail/Views/Settings/SettingsView.swift
+++ b/Mail/Views/Settings/SettingsView.swift
@@ -40,7 +40,7 @@ struct SettingsView: View {
                             }
                             if let title = section.name {
                                 Text(title)
-                                    .textStyle(.calloutSecondary)
+                                    .textStyle(.bodySmallSecondary)
                                     .padding(.horizontal, 8)
                             }
                         }
diff --git a/Mail/Views/Settings/SwipeConfigCell.swift b/Mail/Views/Settings/SwipeConfigCell.swift
index 45ad5d963..2f3407fc3 100644
--- a/Mail/Views/Settings/SwipeConfigCell.swift
+++ b/Mail/Views/Settings/SwipeConfigCell.swift
@@ -61,7 +61,7 @@ struct SwipeConfigCell: View {
                         }
 
                         Text(MailResourcesStrings.Localizable.settingsSwipeActionToDefine)
-                            .textStyle(.calloutSecondary)
+                            .textStyle(.bodySmallSecondary)
                     } else {
                         action.swipeTint
                         action.swipeIcon?
diff --git a/Mail/Views/Switch User/AccountCellView.swift b/Mail/Views/Switch User/AccountCellView.swift
index 1301c3f2b..cef4a420e 100644
--- a/Mail/Views/Switch User/AccountCellView.swift	
+++ b/Mail/Views/Switch User/AccountCellView.swift	
@@ -81,7 +81,7 @@ struct AccountHeaderCell: View {
                 Text(account.user.displayName)
                     .textStyle(.bodyMedium)
                 Text(account.user.email)
-                    .textStyle(.callout)
+                    .textStyle(.bodySmall)
             }
 
             Spacer()
diff --git a/Mail/Views/Switch User/AccountListMailView.swift b/Mail/Views/Switch User/AccountListMailView.swift
index 2ea65dc3c..6916ba40d 100644
--- a/Mail/Views/Switch User/AccountListMailView.swift	
+++ b/Mail/Views/Switch User/AccountListMailView.swift	
@@ -42,7 +42,7 @@ struct AccountListMailView: View {
 
             if mailbox.unseenMessages > 0 {
                 Text(mailbox.unseenMessages < 100 ? "\(mailbox.unseenMessages)" : "99+")
-                    .textStyle(isSelected ? .calloutMediumAccent : .calloutAccent)
+                    .textStyle(.bodySmallMediumAccent)
             }
         }
         .textStyle(isSelected ? .bodyMediumAccent : .body)
diff --git a/Mail/Views/Switch User/AccountView.swift b/Mail/Views/Switch User/AccountView.swift
index 560f30b08..05f16154f 100644
--- a/Mail/Views/Switch User/AccountView.swift	
+++ b/Mail/Views/Switch User/AccountView.swift	
@@ -94,7 +94,7 @@ struct AccountView: View {
                     // Email list
                     VStack(alignment: .leading, spacing: 12) {
                         Text(MailResourcesStrings.Localizable.buttonAccountAssociatedEmailAddresses)
-                            .textStyle(.calloutSecondary)
+                            .textStyle(.bodySmallSecondary)
                             .padding(.horizontal, 24)
                             .padding(.bottom, 16)
 
diff --git a/Mail/Views/TextStylePreview.swift b/Mail/Views/TextStylePreview.swift
index b64b8cc06..c86a30640 100644
--- a/Mail/Views/TextStylePreview.swift
+++ b/Mail/Views/TextStylePreview.swift
@@ -32,18 +32,10 @@ struct TextStylePreview: View {
                         .textStyle(.body)
                     Text("Body secondary")
                         .textStyle(.bodySecondary)
-                    Text("Callout strong")
-                        .textStyle(.calloutStrong)
-                    Text("Callout")
-                        .textStyle(.callout)
-                    Text("Callout accent")
-                        .textStyle(.calloutAccent)
-                    Text("Callout secondary")
-                        .textStyle(.calloutSecondary)
+                    Text("Body small")
+                        .textStyle(.bodySmall)
                 }
                 Group {
-                    Text("Callout tertiary")
-                        .textStyle(.calloutTertiary)
                     Text("Body medium accent")
                         .textStyle(.bodyMediumAccent)
                     Text("Body medium on accent")
diff --git a/Mail/Views/Thread List/NoNetworkView.swift b/Mail/Views/Thread List/NoNetworkView.swift
index c3d73b997..0e07a824b 100644
--- a/Mail/Views/Thread List/NoNetworkView.swift	
+++ b/Mail/Views/Thread List/NoNetworkView.swift	
@@ -29,11 +29,11 @@ struct NoNetworkView: View {
                     .scaledToFit()
                     .frame(width: 18, height: 18)
                 Text(MailResourcesStrings.Localizable.noNetworkTitle)
-                    .textStyle(.calloutWarning)
+                    .textStyle(.bodySmallWarning)
             }
             .foregroundColor(MailResourcesAsset.warningColor)
             Text(MailResourcesStrings.Localizable.noNetworkDescription)
-                .textStyle(.calloutSecondary)
+                .textStyle(.bodySmallSecondary)
         }
         .frame(maxWidth: .infinity, alignment: .leading)
     }
diff --git a/Mail/Views/Thread List/ThreadListHeader.swift b/Mail/Views/Thread List/ThreadListHeader.swift
index 79b664aa9..a5c8c6580 100644
--- a/Mail/Views/Thread List/ThreadListHeader.swift	
+++ b/Mail/Views/Thread List/ThreadListHeader.swift	
@@ -54,7 +54,7 @@ struct ThreadListHeader: View {
             if isConnected {
                 if let lastUpdateText = lastUpdateText {
                     Text(MailResourcesStrings.Localizable.threadListHeaderLastUpdate(lastUpdateText))
-                        .textStyle(.calloutSecondary)
+                        .textStyle(.bodySmallSecondary)
                 }
             } else {
                 NoNetworkView()
@@ -94,7 +94,7 @@ struct UnreadToggleStyle: ToggleStyle {
                     Image(systemName: "xmark")
                 }
             }
-            .textStyle(configuration.isOn ? .calloutStrongOnAccent : .calloutStrongAccent)
+            .textStyle(configuration.isOn ? .bodyMediumOnAccent : .bodySmallMediumAccent)
             .padding(.vertical, 4)
             .padding(.horizontal, 8)
             .background(
diff --git a/Mail/Views/Thread List/ThreadListView.swift b/Mail/Views/Thread List/ThreadListView.swift
index 6ac1dab88..36987f0d8 100644
--- a/Mail/Views/Thread List/ThreadListView.swift	
+++ b/Mail/Views/Thread List/ThreadListView.swift	
@@ -103,7 +103,7 @@ struct ThreadListView: View {
                         } header: {
                             if threadDensity != .compact {
                                 Text(section.title)
-                                    .textStyle(.calloutSecondary)
+                                    .textStyle(.bodySmallSecondary)
                             }
                         }
                     }
diff --git a/Mail/Views/Thread/AttachmentCell.swift b/Mail/Views/Thread/AttachmentCell.swift
index ec9ac04df..75b622c3e 100644
--- a/Mail/Views/Thread/AttachmentCell.swift
+++ b/Mail/Views/Thread/AttachmentCell.swift
@@ -31,7 +31,7 @@ struct AttachmentCell: View {
 
             VStack(alignment: .leading, spacing: 0) {
                 Text(attachment.name)
-                    .textStyle(.callout)
+                    .textStyle(.bodySmall)
                     .lineLimit(1)
                     .truncationMode(.middle)
                 Text(attachment.size, format: .defaultByteCount)
diff --git a/Mail/Views/Thread/AttachmentsView.swift b/Mail/Views/Thread/AttachmentsView.swift
index 418f630cd..5ca95c695 100644
--- a/Mail/Views/Thread/AttachmentsView.swift
+++ b/Mail/Views/Thread/AttachmentsView.swift
@@ -63,13 +63,13 @@ struct AttachmentsView: View {
                         .scaledToFit()
                         .frame(width: 15, height: 15)
                 }
-                .textStyle(.calloutSecondary)
+                .textStyle(.bodySmallSecondary)
 
                 Button(MailResourcesStrings.Localizable.buttonDownloadAll) {
                     // TODO: Download all attachments
                     showWorkInProgressSnackBar()
                 }
-                .textStyle(.calloutAccent)
+                .textStyle(.bodySmallAccent)
 
                 Spacer()
             }
diff --git a/Mail/Views/Thread/MessageHeaderDetailView.swift b/Mail/Views/Thread/MessageHeaderDetailView.swift
index 5d0d12204..a1c4a0e5e 100644
--- a/Mail/Views/Thread/MessageHeaderDetailView.swift
+++ b/Mail/Views/Thread/MessageHeaderDetailView.swift
@@ -62,7 +62,7 @@ struct MessageHeaderDetailView: View {
                     .frame(width: labelWidth, height: 17, alignment: .leading)
                     .foregroundColor(MailResourcesAsset.secondaryTextColor)
                 Text(message.date.formatted(date: .long, time: .shortened))
-                    .textStyle(.calloutSecondary)
+                    .textStyle(.bodySmallSecondary)
             }
         }
         .frame(maxWidth: .infinity, alignment: .leading)
@@ -87,7 +87,7 @@ struct RecipientLabel: View {
     var body: some View {
         HStack(alignment: .top) {
             Text(title)
-                .textStyle(.calloutSecondary)
+                .textStyle(.bodySmallSecondary)
                 .background(ViewGeometry())
                 .frame(width: labelWidth, alignment: .leading)
             VStack(alignment: .leading, spacing: 4) {
@@ -97,7 +97,7 @@ struct RecipientLabel: View {
                             recipientTapped(recipient)
                         } label: {
                             Text(recipient.name.isEmpty ? recipient.email : recipient.name.removePunctuation)
-                                .textStyle(.calloutAccent)
+                                .textStyle(.bodySmallAccent)
                                 .lineLimit(1)
                                 .layoutPriority(1)
                         }
diff --git a/Mail/Views/Thread/MessageHeaderSummaryView.swift b/Mail/Views/Thread/MessageHeaderSummaryView.swift
index c344080c7..1cdf47bdc 100644
--- a/Mail/Views/Thread/MessageHeaderSummaryView.swift
+++ b/Mail/Views/Thread/MessageHeaderSummaryView.swift
@@ -75,7 +75,7 @@ struct MessageHeaderSummaryView: View {
                         HStack {
                             Text(message.recipients.map(\.title), format: .list(type: .and))
                                 .lineLimit(1)
-                                .textStyle(.calloutSecondary)
+                                .textStyle(.bodySmallSecondary)
                             ChevronButton(isExpanded: $isHeaderExpanded)
                         }
                     } else {
diff --git a/MailCore/Utils/MailTextStyle.swift b/MailCore/Utils/MailTextStyle.swift
index 635df4cf2..580d52704 100644
--- a/MailCore/Utils/MailTextStyle.swift
+++ b/MailCore/Utils/MailTextStyle.swift
@@ -100,48 +100,43 @@ public struct MailTextStyle {
         color: MailResourcesAsset.redActionColor
     )
 
-    public static let calloutStrongAccent = MailTextStyle(
-        font: .system(size: 13.5, weight: .bold),
+    public static let bodySmallMedium = MailTextStyle(
+        font: .system(size: 14, weight: .medium),
+        color: MailResourcesAsset.primaryTextColor
+    )
+
+    public static let bodySmallMediumAccent = MailTextStyle(
+        font: .system(size: 14, weight: .medium),
         color: \.primary
     )
 
-    public static let calloutStrongOnAccent = MailTextStyle(
-        font: .system(size: 13.5, weight: .bold),
+    public static let bodySmallMediumOnAccent = MailTextStyle(
+        font: .system(size: 14, weight: .medium),
         color: MailResourcesAsset.onAccentColor
     )
 
-    public static let calloutStrong = MailTextStyle(
-        font: .system(size: 13.5, weight: .bold),
+    public static let bodySmall = MailTextStyle(
+        font: .system(size: 14),
         color: MailResourcesAsset.primaryTextColor
     )
 
-    public static let calloutMediumAccent = MailTextStyle(
-        font: .system(size: 13.5, weight: .medium),
+    public static let bodySmallAccent = MailTextStyle(
+        font: .system(size: 14),
         color: \.primary
     )
 
-    public static let calloutAccent = MailTextStyle(
-        font: .system(size: 13.5),
-        color: \.primary
-    )
-
-    public static let callout = MailTextStyle(
-        font: .system(size: 13.5),
-        color: MailResourcesAsset.primaryTextColor
-    )
-
-    public static let calloutSecondary = MailTextStyle(
-        font: .system(size: 13.5),
+    public static let bodySmallSecondary = MailTextStyle(
+        font: .system(size: 14),
         color: MailResourcesAsset.secondaryTextColor
     )
 
-    public static let calloutTertiary = MailTextStyle(
-        font: .system(size: 13.5),
+    public static let bodySmallTertiary = MailTextStyle(
+        font: .system(size: 14),
         color: MailResourcesAsset.hintTextColor
     )
 
-    public static let calloutWarning = MailTextStyle(
-        font: .system(size: 13.5),
+    public static let bodySmallWarning = MailTextStyle(
+        font: .system(size: 14),
         color: MailResourcesAsset.warningColor
     )
 

From 1eadf3df3baf44fb9c83a929c5d5a988d042886d Mon Sep 17 00:00:00 2001
From: Elena Willen <elena.willen@infomaniak.com>
Date: Thu, 5 Jan 2023 14:42:11 +0100
Subject: [PATCH 09/12] refactor(MailTextStyle): Change caption to label

---
 Mail/Components/ToolbarButton.swift                |  2 +-
 Mail/Views/Attachment/AttachmentPreview.swift      |  2 +-
 Mail/Views/Bottom sheets/Actions/ActionsView.swift |  2 +-
 Mail/Views/Menu Drawer/MenuDrawerView.swift        |  2 +-
 Mail/Views/Thread/AttachmentCell.swift             |  2 +-
 Mail/Views/Thread/MessageHeaderDetailView.swift    |  2 +-
 Mail/Views/Thread/MessageHeaderSummaryView.swift   |  2 +-
 MailCore/Utils/MailTextStyle.swift                 | 12 ++++++------
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Mail/Components/ToolbarButton.swift b/Mail/Components/ToolbarButton.swift
index bc8b4a26b..08ac18f18 100644
--- a/Mail/Components/ToolbarButton.swift
+++ b/Mail/Components/ToolbarButton.swift
@@ -39,7 +39,7 @@ struct ToolbarButton: View {
         Button(action: action) {
             Label {
                 Text(text)
-                    .textStyle(MailTextStyle.captionMediumSecondary)
+                    .textStyle(MailTextStyle.labelMediumAccent)
             } icon: {
                 Image(resource: icon)
                     .resizable()
diff --git a/Mail/Views/Attachment/AttachmentPreview.swift b/Mail/Views/Attachment/AttachmentPreview.swift
index c91e5080f..95f3f6ece 100644
--- a/Mail/Views/Attachment/AttachmentPreview.swift
+++ b/Mail/Views/Attachment/AttachmentPreview.swift
@@ -50,7 +50,7 @@ struct AttachmentPreview: View {
                     Button(action: download) {
                         Label {
                             Text(MailResourcesStrings.Localizable.buttonDownload)
-                                .font(MailTextStyle.captionSecondary.font)
+                                .font(MailTextStyle.labelSecondary.font)
                         } icon: {
                             Image(resource: MailResourcesAsset.download)
                                 .resizable()
diff --git a/Mail/Views/Bottom sheets/Actions/ActionsView.swift b/Mail/Views/Bottom sheets/Actions/ActionsView.swift
index 72012e558..948da5881 100644
--- a/Mail/Views/Bottom sheets/Actions/ActionsView.swift	
+++ b/Mail/Views/Bottom sheets/Actions/ActionsView.swift	
@@ -106,7 +106,7 @@ struct QuickActionView: View {
                 .aspectRatio(1, contentMode: .fit)
 
                 Text(action.title)
-                    .textStyle(.captionMediumAccent)
+                    .textStyle(.labelMediumAccent)
                     .lineLimit(action.title.split(separator: " ").count > 1 ? nil : 1)
                     .minimumScaleFactor(0.75)
             }
diff --git a/Mail/Views/Menu Drawer/MenuDrawerView.swift b/Mail/Views/Menu Drawer/MenuDrawerView.swift
index 69e467689..ecb1654f5 100644
--- a/Mail/Views/Menu Drawer/MenuDrawerView.swift	
+++ b/Mail/Views/Menu Drawer/MenuDrawerView.swift	
@@ -183,7 +183,7 @@ struct AppVersionView: View {
     var body: some View {
         IKDivider(withPadding: true)
         Text(Constants.appVersion())
-            .textStyle(.captionSecondary)
+            .textStyle(.labelSecondary)
     }
 }
 
diff --git a/Mail/Views/Thread/AttachmentCell.swift b/Mail/Views/Thread/AttachmentCell.swift
index 75b622c3e..4d6384ef4 100644
--- a/Mail/Views/Thread/AttachmentCell.swift
+++ b/Mail/Views/Thread/AttachmentCell.swift
@@ -35,7 +35,7 @@ struct AttachmentCell: View {
                     .lineLimit(1)
                     .truncationMode(.middle)
                 Text(attachment.size, format: .defaultByteCount)
-                    .textStyle(.captionSecondary)
+                    .textStyle(.labelSecondary)
             }
 
             if isNewMessage {
diff --git a/Mail/Views/Thread/MessageHeaderDetailView.swift b/Mail/Views/Thread/MessageHeaderDetailView.swift
index a1c4a0e5e..5cc630a49 100644
--- a/Mail/Views/Thread/MessageHeaderDetailView.swift
+++ b/Mail/Views/Thread/MessageHeaderDetailView.swift
@@ -103,7 +103,7 @@ struct RecipientLabel: View {
                         }
                         if !recipient.name.isEmpty {
                             Text(recipient.email)
-                                .textStyle(.captionSecondary)
+                                .textStyle(.labelSecondary)
                                 .lineLimit(1)
                         }
                     }
diff --git a/Mail/Views/Thread/MessageHeaderSummaryView.swift b/Mail/Views/Thread/MessageHeaderSummaryView.swift
index 1cdf47bdc..46e515dfd 100644
--- a/Mail/Views/Thread/MessageHeaderSummaryView.swift
+++ b/Mail/Views/Thread/MessageHeaderSummaryView.swift
@@ -67,7 +67,7 @@ struct MessageHeaderSummaryView: View {
                             Text(message.date.customRelativeFormatted)
                                 .lineLimit(1)
                                 .layoutPriority(1)
-                                .textStyle(.captionSecondary)
+                                .textStyle(.labelSecondary)
                         }
                     }
 
diff --git a/MailCore/Utils/MailTextStyle.swift b/MailCore/Utils/MailTextStyle.swift
index 580d52704..85b6bdc07 100644
--- a/MailCore/Utils/MailTextStyle.swift
+++ b/MailCore/Utils/MailTextStyle.swift
@@ -140,18 +140,18 @@ public struct MailTextStyle {
         color: MailResourcesAsset.warningColor
     )
 
-    public static let captionMediumAccent = MailTextStyle(
-        font: .system(size: 11.5, weight: .medium),
+    public static let labelMediumAccent = MailTextStyle(
+        font: .system(size: 12, weight: .medium),
         color: \.primary
     )
 
-    public static let captionMediumSecondary = MailTextStyle(
-        font: .system(size: 11.5, weight: .medium),
+    public static let labelMediumSecondary = MailTextStyle(
+        font: .system(size: 12, weight: .medium),
         color: MailResourcesAsset.secondaryTextColor
     )
 
-    public static let captionSecondary = MailTextStyle(
-        font: .system(size: 11.5),
+    public static let labelSecondary = MailTextStyle(
+        font: .system(size: 12),
         color: MailResourcesAsset.secondaryTextColor
     )
 }

From 8747b3f064383a8e90ee7b616013d779fc9b1d02 Mon Sep 17 00:00:00 2001
From: Elena Willen <elena.willen@infomaniak.com>
Date: Thu, 5 Jan 2023 14:42:49 +0100
Subject: [PATCH 10/12] refactor: Update thread spacing

---
 Mail/Components/ThreadCell.swift | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Mail/Components/ThreadCell.swift b/Mail/Components/ThreadCell.swift
index bdf4b9bf6..505909851 100644
--- a/Mail/Components/ThreadCell.swift
+++ b/Mail/Components/ThreadCell.swift
@@ -35,7 +35,7 @@ extension Animation {
 
 extension ThreadDensity {
     var cellVerticalPadding: CGFloat {
-        self == .compact ? 10 : 16
+        self == .compact ? 10 : 12
     }
 }
 
@@ -79,7 +79,7 @@ struct ThreadCell: View {
             }
             .padding(.trailing, 4)
 
-            VStack(alignment: .leading, spacing: 8) {
+            VStack(alignment: .leading, spacing: 0) {
                 cellHeader
 
                 HStack(alignment: .top, spacing: 3) {
@@ -148,7 +148,7 @@ struct ThreadCell: View {
     }
 
     private var threadInfo: some View {
-        VStack(alignment: .leading, spacing: 8) {
+        VStack(alignment: .leading, spacing: 4) {
             Text(thread.formattedSubject)
                 .textStyle(.body)
                 .lineLimit(1)

From 666aa8a255c6742ffee576abedad0f4ebb5420f4 Mon Sep 17 00:00:00 2001
From: Elena Willen <elena.willen@infomaniak.com>
Date: Thu, 5 Jan 2023 16:02:22 +0100
Subject: [PATCH 11/12] fix: Typo

---
 Mail/Views/Thread List/ThreadListHeader.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Mail/Views/Thread List/ThreadListHeader.swift b/Mail/Views/Thread List/ThreadListHeader.swift
index a5c8c6580..b05b38ffb 100644
--- a/Mail/Views/Thread List/ThreadListHeader.swift	
+++ b/Mail/Views/Thread List/ThreadListHeader.swift	
@@ -94,7 +94,7 @@ struct UnreadToggleStyle: ToggleStyle {
                     Image(systemName: "xmark")
                 }
             }
-            .textStyle(configuration.isOn ? .bodyMediumOnAccent : .bodySmallMediumAccent)
+            .textStyle(configuration.isOn ? .bodySmallMediumOnAccent : .bodySmallMediumAccent)
             .padding(.vertical, 4)
             .padding(.horizontal, 8)
             .background(

From 48a910d53f5dd0228f2574c1092baf355a9b7178 Mon Sep 17 00:00:00 2001
From: Elena Willen <elena.willen@infomaniak.com>
Date: Thu, 5 Jan 2023 16:48:07 +0100
Subject: [PATCH 12/12] refactor: Update Avatar and checkbox size

---
 Mail/Components/ThreadCell.swift | 12 ++++--------
 MailCore/Utils/Constants.swift   |  5 ++---
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/Mail/Components/ThreadCell.swift b/Mail/Components/ThreadCell.swift
index 505909851..9009a2107 100644
--- a/Mail/Components/ThreadCell.swift
+++ b/Mail/Components/ThreadCell.swift
@@ -49,11 +49,7 @@ struct ThreadCell: View {
     var isSelected = false
 
     private var checkboxSize: CGFloat {
-        threadDensity == .compact ? Constants.checkboxCompactSize : Constants.checkboxSize
-    }
-
-    private var checkmarkSize: CGFloat {
-        threadDensity == .compact ? Constants.checkmarkCompactSize : Constants.checkmarkSize
+        threadDensity == .large ? Constants.checkboxLargeSize : Constants.checkboxSize
     }
 
     // MARK: - Views
@@ -67,7 +63,7 @@ struct ThreadCell: View {
             Group {
                 if threadDensity == .large, let recipient = thread.from.last {
                     ZStack {
-                        RecipientImage(recipient: recipient, size: 32)
+                        RecipientImage(recipient: recipient)
                         checkbox
                             .opacity(isSelected ? 1 : 0)
                     }
@@ -79,7 +75,7 @@ struct ThreadCell: View {
             }
             .padding(.trailing, 4)
 
-            VStack(alignment: .leading, spacing: 0) {
+            VStack(alignment: .leading, spacing: 4) {
                 cellHeader
 
                 HStack(alignment: .top, spacing: 3) {
@@ -111,7 +107,7 @@ struct ThreadCell: View {
                 .frame(width: checkboxSize, height: checkboxSize)
             Image(resource: MailResourcesAsset.check)
                 .foregroundColor(MailResourcesAsset.onAccentColor)
-                .frame(height: checkmarkSize)
+                .frame(height: Constants.checkmarkSize)
                 .opacity(isSelected ? 1 : 0)
         }
     }
diff --git a/MailCore/Utils/Constants.swift b/MailCore/Utils/Constants.swift
index 49ee2be4a..a55d2e085 100644
--- a/MailCore/Utils/Constants.swift
+++ b/MailCore/Utils/Constants.swift
@@ -91,9 +91,8 @@ public enum Constants {
 
     public static let unreadIconSize: CGFloat = 8
     public static let checkboxSize: CGFloat = 32
-    public static let checkmarkSize: CGFloat = 15
-    public static let checkboxCompactSize: CGFloat = 24
-    public static let checkmarkCompactSize: CGFloat = 13
+    public static let checkmarkSize: CGFloat = 14
+    public static let checkboxLargeSize: CGFloat = 40
 
     public static let mailRegex =
         "(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|\"(?:[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x21\\x23-\\x5b\\x5d-\\x7f]|\\\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f])*\")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x21-\\x5a\\x53-\\x7f]|\\\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f])+)\\])"