From 54be022761bfaa1471899bad20d029a4e451bf39 Mon Sep 17 00:00:00 2001
From: Leendert de Borst <ldeborst@xivisoft.com>
Date: Fri, 6 Mar 2026 09:14:38 +0100
Subject: [PATCH] Update DatabaseMessageStore.cs

---
 .../AliasVault.SmtpService/Handlers/DatabaseMessageStore.cs   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/server/Services/AliasVault.SmtpService/Handlers/DatabaseMessageStore.cs b/apps/server/Services/AliasVault.SmtpService/Handlers/DatabaseMessageStore.cs
index bfd696698..1428d3db4 100644
--- a/apps/server/Services/AliasVault.SmtpService/Handlers/DatabaseMessageStore.cs
+++ b/apps/server/Services/AliasVault.SmtpService/Handlers/DatabaseMessageStore.cs
@@ -275,11 +275,11 @@ public class DatabaseMessageStore(ILogger<DatabaseMessageStore> logger, Config c
 
         if (attachment is MimePart mimePartAttachment)
         {
-            mimePartAttachment.Content.DecodeTo(memory);
+            mimePartAttachment.Content?.DecodeTo(memory);
         }
         else
         {
-            ((MessagePart)attachment).Message.WriteTo(memory);
+            ((MessagePart)attachment).Message?.WriteTo(memory);
         }
 
         return memory.ToArray();