diff --git a/Wino.Services/AccountService.cs b/Wino.Services/AccountService.cs
index f0629884..0559ccee 100644
--- a/Wino.Services/AccountService.cs
+++ b/Wino.Services/AccountService.cs
@@ -518,6 +518,12 @@ public class AccountService : BaseDatabaseService, IAccountService
             ShouldAppendMessagesToSentFolder = false
         };
 
+        // iCloud does not appends sent messages to sent folder automatically.
+        if (account.SpecialImapProvider == SpecialImapProvider.iCloud || account.SpecialImapProvider == SpecialImapProvider.Yahoo)
+        {
+            preferences.ShouldAppendMessagesToSentFolder = true;
+        }
+
         account.Preferences = preferences;
 
         // Outlook & Office 365 supports Focused inbox. Enabled by default.