diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListMultiSelection.kt b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListMultiSelection.kt
index 63725a6323..2760e7b3b5 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListMultiSelection.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListMultiSelection.kt
@@ -44,7 +44,7 @@ import com.infomaniak.mail.utils.extensions.updateNavigationBarColor
 class ThreadListMultiSelection {
 
     lateinit var mainViewModel: MainViewModel
-    lateinit var threadListFragment: ThreadListFragment
+    private lateinit var threadListFragment: ThreadListFragment
     lateinit var unlockSwipeActionsIfSet: () -> Unit
     lateinit var localSettings: LocalSettings
 
diff --git a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
index ce610e50db..ec2b91256b 100644
--- a/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
+++ b/app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt
@@ -475,7 +475,9 @@ class NewMessageFragment : Fragment() {
             if (isFirstTime) {
                 isFirstTime = false
                 observeImportAttachments()
-            } else {
+            } else if (attachments.count() > attachmentAdapter.itemCount) {
+                // If we are adding Attachments, directly save the Draft, so the Attachments' upload starts now.
+                // TODO: Only save Attachments, and not the whole Draft.
                 saveDraft()
             }