From 7ae6ed12fb587001e33da258723137d441ffee82 Mon Sep 17 00:00:00 2001
From: mdecimus <mauro@stalw.art>
Date: Wed, 16 Jul 2025 16:39:09 +0200
Subject: [PATCH] JMAP sortOrder should not be null (fixes #1831)

---
 crates/jmap/src/mailbox/get.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/crates/jmap/src/mailbox/get.rs b/crates/jmap/src/mailbox/get.rs
index a01b74e6..36759802 100644
--- a/crates/jmap/src/mailbox/get.rs
+++ b/crates/jmap/src/mailbox/get.rs
@@ -101,7 +101,9 @@ impl MailboxGet for Server {
                             Value::Null
                         }
                     }
-                    Property::SortOrder => Value::from(cached_mailbox.sort_order()),
+                    Property::SortOrder => {
+                        Value::from(cached_mailbox.sort_order().unwrap_or_default())
+                    }
                     Property::ParentId => {
                         if let Some(parent_id) = cached_mailbox.parent_id() {
                             Value::Id((parent_id).into())