diff --git a/src/core/DigitalData.MessagingService.Domain/Entities/ReceivedEmail.cs b/src/core/DigitalData.MessagingService.Domain/Entities/ReceivedEmail.cs
index 4b1eb4d..4ec4f7f 100644
--- a/src/core/DigitalData.MessagingService.Domain/Entities/ReceivedEmail.cs
+++ b/src/core/DigitalData.MessagingService.Domain/Entities/ReceivedEmail.cs
@@ -45,9 +45,9 @@ public sealed record ReceivedEmail
     /// </summary>
     [Column("TO", TypeName = "nvarchar(max)")]
 #if NET
-    public IEnumerable<string> To { get; init; } = [];
+    public List<string> To { get; init; } = [];
 #else
-    public IEnumerable<string> To { get; set; } = [];
+    public List<string> To { get; set; } = [];
 #endif
 
     /// <summary>
@@ -55,9 +55,9 @@ public sealed record ReceivedEmail
     /// </summary>
     [Column("CC", TypeName = "nvarchar(max)")]
 #if NET
-    public IEnumerable<string> Cc { get; init; } = [];
+    public List<string> Cc { get; init; } = [];
 #else
-    public IEnumerable<string> Cc { get; set; } = [];
+    public List<string> Cc { get; set; } = [];
 #endif
 
     /// <summary>
@@ -133,4 +133,10 @@ public sealed record ReceivedEmail
 #else
     public EmailAccount? Account { get; set; }
 #endif
+
+#if NET
+    public required string Folder { get; init; }
+#else
+    public string Folder { get; set; } = null!;
+#endif
 }