diff --git a/Mail/Views/New Message/Attachments/AttachmentUploadCell.swift b/Mail/Views/New Message/Attachments/AttachmentUploadCell.swift
index 6f4b9b1da..2d16eb357 100644
--- a/Mail/Views/New Message/Attachments/AttachmentUploadCell.swift	
+++ b/Mail/Views/New Message/Attachments/AttachmentUploadCell.swift	
@@ -16,6 +16,8 @@
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import InfomaniakCoreUI
+import InfomaniakDI
 import MailCore
 import MailResources
 import SwiftUI
@@ -34,6 +36,8 @@ struct AttachmentUploadCell: View {
         ) {
             Button {
                 if let attachmentRemoved {
+                    @InjectService var matomo: MatomoUtils
+                    matomo.track(eventWithCategory: .attachmentActions, name: "delete")
                     attachmentRemoved(attachment)
                 }
             } label: {
diff --git a/Mail/Views/Settings/General/SettingsThreadModeView.swift b/Mail/Views/Settings/General/SettingsThreadModeView.swift
index 50d319b89..c96e6d076 100644
--- a/Mail/Views/Settings/General/SettingsThreadModeView.swift
+++ b/Mail/Views/Settings/General/SettingsThreadModeView.swift
@@ -16,6 +16,8 @@
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import InfomaniakCoreUI
+import InfomaniakDI
 import MailCore
 import MailResources
 import SwiftUI
@@ -46,6 +48,8 @@ struct SettingsThreadModeView: View {
                         isLast: value == ThreadMode.allCases.last
                     ) {
                         if value != selectedValue {
+                            @InjectService var matomo: MatomoUtils
+                            matomo.track(eventWithCategory: .settingsThreadMode, name: value.rawValue)
                             threadModeSettingUpdate = ThreadModeSettingUpdate(newSetting: value)
                         }
                     }
diff --git a/Mail/Views/Thread List/ThreadListView.swift b/Mail/Views/Thread List/ThreadListView.swift
index ad379315d..ce2cda4d3 100644
--- a/Mail/Views/Thread List/ThreadListView.swift	
+++ b/Mail/Views/Thread List/ThreadListView.swift	
@@ -130,6 +130,7 @@ struct ThreadListView: View {
                                 }
                                 Task {
                                     await tryOrDisplayError {
+                                        matomo.track(eventWithCategory: .threadList, name: "loadMore")
                                         _ = try await viewModel.mailboxManager.fetchOnePage(
                                             folder: viewModel.folder.freeze(),
                                             direction: .previous
diff --git a/MailCore/Utils/Matomo+Extension.swift b/MailCore/Utils/Matomo+Extension.swift
index 4468cbed4..41a346512 100644
--- a/MailCore/Utils/Matomo+Extension.swift
+++ b/MailCore/Utils/Matomo+Extension.swift
@@ -75,6 +75,7 @@ public extension MatomoUtils.EventCategory {
     static let settingsTheme = MatomoUtils.EventCategory(displayName: "settingsTheme")
     static let settingsSend = MatomoUtils.EventCategory(displayName: "settingsSend")
     static let settingsSwipeActions = MatomoUtils.EventCategory(displayName: "settingsSwipeActions")
+    static let settingsThreadMode = MatomoUtils.EventCategory(displayName: "settingsThreadMode")
     static let settingsDisplayExternalContent = MatomoUtils.EventCategory(displayName: "settingsDisplayExternalContent")
 }