diff --git a/app/src/main/java/ch/protonmail/android/compose/send/SendMessageWorker.kt b/app/src/main/java/ch/protonmail/android/compose/send/SendMessageWorker.kt
index d24724b9c..90d33afe1 100644
--- a/app/src/main/java/ch/protonmail/android/compose/send/SendMessageWorker.kt
+++ b/app/src/main/java/ch/protonmail/android/compose/send/SendMessageWorker.kt
@@ -209,7 +209,8 @@ class SendMessageWorker @AssistedInject constructor(
         tryWithRetry {
             messageDetailsRepository.getRemoteMessageDetails(messageId, userId)
         }.map { remoteDraft ->
-            localDraft.attachments = localDraft.attachments.plus(remoteDraft.attachments)
+            localDraft.attachments = remoteDraft.attachments
+            localDraft.numAttachments = remoteDraft.numAttachments
         }
         return localDraft
     }