diff --git a/internal/user/imap.go b/internal/user/imap.go
index 7b85d0eb..c6f9869b 100644
--- a/internal/user/imap.go
+++ b/internal/user/imap.go
@@ -491,10 +491,18 @@ func toIMAPMessage(message liteapi.MessageMetadata) imap.Message {
 		flags = flags.Add(imap.FlagDraft)
 	}
 
+	var date time.Time
+
+	if message.Time > 0 {
+		date = time.Unix(message.Time, 0)
+	} else {
+		date = time.Now()
+	}
+
 	return imap.Message{
 		ID:    imap.MessageID(message.ID),
 		Flags: flags,
-		Date:  time.Unix(message.Time, 0),
+		Date:  date,
 	}
 }