diff --git a/Cargo.lock b/Cargo.lock
index c056e31d..6cba5982 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1179,7 +1179,7 @@ dependencies = [
 
 [[package]]
 name = "common"
-version = "0.10.6"
+version = "0.10.7"
 dependencies = [
  "aes-gcm-siv",
  "ahash 0.8.11",
@@ -1804,7 +1804,7 @@ dependencies = [
 
 [[package]]
 name = "directory"
-version = "0.10.6"
+version = "0.10.7"
 dependencies = [
  "ahash 0.8.11",
  "argon2",
@@ -3260,7 +3260,7 @@ checksum = "edcd27d72f2f071c64249075f42e205ff93c9a4c5f6c6da53e79ed9f9832c285"
 
 [[package]]
 name = "imap"
-version = "0.10.6"
+version = "0.10.7"
 dependencies = [
  "ahash 0.8.11",
  "common",
@@ -3478,7 +3478,7 @@ dependencies = [
 
 [[package]]
 name = "jmap"
-version = "0.10.6"
+version = "0.10.7"
 dependencies = [
  "aes",
  "aes-gcm",
@@ -3559,7 +3559,7 @@ dependencies = [
 
 [[package]]
 name = "jmap_proto"
-version = "0.10.6"
+version = "0.10.7"
 dependencies = [
  "ahash 0.8.11",
  "fast-float",
@@ -3916,7 +3916,7 @@ dependencies = [
 
 [[package]]
 name = "mail-server"
-version = "0.10.6"
+version = "0.10.7"
 dependencies = [
  "common",
  "directory",
@@ -3935,7 +3935,7 @@ dependencies = [
 
 [[package]]
 name = "managesieve"
-version = "0.10.6"
+version = "0.10.7"
 dependencies = [
  "ahash 0.8.11",
  "bincode",
@@ -4230,7 +4230,7 @@ dependencies = [
 
 [[package]]
 name = "nlp"
-version = "0.10.6"
+version = "0.10.7"
 dependencies = [
  "ahash 0.8.11",
  "bincode",
@@ -4787,7 +4787,7 @@ dependencies = [
 
 [[package]]
 name = "pop3"
-version = "0.10.6"
+version = "0.10.7"
 dependencies = [
  "common",
  "directory",
@@ -6427,7 +6427,7 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "smtp"
-version = "0.10.6"
+version = "0.10.7"
 dependencies = [
  "ahash 0.8.11",
  "bincode",
@@ -6543,7 +6543,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 
 [[package]]
 name = "stalwart-cli"
-version = "0.10.6"
+version = "0.10.7"
 dependencies = [
  "clap",
  "console",
@@ -6574,7 +6574,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
 [[package]]
 name = "store"
-version = "0.10.6"
+version = "0.10.7"
 dependencies = [
  "ahash 0.8.11",
  "arc-swap",
@@ -7254,7 +7254,7 @@ dependencies = [
 
 [[package]]
 name = "trc"
-version = "0.10.6"
+version = "0.10.7"
 dependencies = [
  "ahash 0.8.11",
  "base64 0.22.1",
@@ -7501,7 +7501,7 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "utils"
-version = "0.10.6"
+version = "0.10.7"
 dependencies = [
  "ahash 0.8.11",
  "base64 0.22.1",
diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
index be81eb46..1a6827a6 100644
--- a/crates/cli/Cargo.toml
+++ b/crates/cli/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Stalwart Labs Ltd. <hello@stalw.art>"]
 license = "AGPL-3.0-only OR LicenseRef-SEL"
 repository = "https://github.com/stalwartlabs/cli"
 homepage = "https://github.com/stalwartlabs/cli"
-version = "0.10.6"
+version = "0.10.7"
 edition = "2021"
 readme = "README.md"
 resolver = "2"
diff --git a/crates/common/Cargo.toml b/crates/common/Cargo.toml
index cbc887ae..d70444e9 100644
--- a/crates/common/Cargo.toml
+++ b/crates/common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "common"
-version = "0.10.6"
+version = "0.10.7"
 edition = "2021"
 resolver = "2"
 
diff --git a/crates/directory/Cargo.toml b/crates/directory/Cargo.toml
index b38c63a3..9005b68c 100644
--- a/crates/directory/Cargo.toml
+++ b/crates/directory/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "directory"
-version = "0.10.6"
+version = "0.10.7"
 edition = "2021"
 resolver = "2"
 
diff --git a/crates/imap/Cargo.toml b/crates/imap/Cargo.toml
index c3a08d7c..7370c32b 100644
--- a/crates/imap/Cargo.toml
+++ b/crates/imap/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "imap"
-version = "0.10.6"
+version = "0.10.7"
 edition = "2021"
 resolver = "2"
 
diff --git a/crates/jmap-proto/Cargo.toml b/crates/jmap-proto/Cargo.toml
index ac33703b..f65c0a5e 100644
--- a/crates/jmap-proto/Cargo.toml
+++ b/crates/jmap-proto/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "jmap_proto"
-version = "0.10.6"
+version = "0.10.7"
 edition = "2021"
 resolver = "2"
 
diff --git a/crates/jmap/Cargo.toml b/crates/jmap/Cargo.toml
index db8c28e3..d4dbc48d 100644
--- a/crates/jmap/Cargo.toml
+++ b/crates/jmap/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "jmap"
-version = "0.10.6"
+version = "0.10.7"
 edition = "2021"
 resolver = "2"
 
diff --git a/crates/jmap/src/api/management/troubleshoot.rs b/crates/jmap/src/api/management/troubleshoot.rs
index 4a176f2a..f1e9e324 100644
--- a/crates/jmap/src/api/management/troubleshoot.rs
+++ b/crates/jmap/src/api/management/troubleshoot.rs
@@ -114,8 +114,8 @@ impl TroubleshootApi for Server {
                 })?;
                 let response = dmarc_troubleshoot(self, request).await.ok_or_else(|| {
                     manage::error(
-                        "Invalid message headers",
-                        "Failed to parse message headers".into(),
+                        "Invalid message body",
+                        "Failed to parse message body".into(),
                     )
                 })?;
 
@@ -783,7 +783,7 @@ struct DmarcTroubleshootRequest {
     ehlo_domain: String,
     #[serde(rename = "mailFrom")]
     mail_from: String,
-    headers: Option<String>,
+    body: Option<String>,
 }
 
 #[derive(Debug, Serialize, Deserialize)]
@@ -895,10 +895,10 @@ async fn dmarc_troubleshoot(
             .await
     };
 
-    let headers = request
-        .headers
+    let body = request
+        .body
         .unwrap_or_else(|| format!("From: {mail_from}\r\nSubject: test\r\n\r\ntest"));
-    let auth_message = AuthenticatedMessage::parse_with_opts(headers.as_bytes(), true)?;
+    let auth_message = AuthenticatedMessage::parse_with_opts(body.as_bytes(), true)?;
 
     let dkim_output = server
         .core
diff --git a/crates/main/Cargo.toml b/crates/main/Cargo.toml
index c66ba4f6..32c58976 100644
--- a/crates/main/Cargo.toml
+++ b/crates/main/Cargo.toml
@@ -7,7 +7,7 @@ homepage = "https://stalw.art"
 keywords = ["imap", "jmap", "smtp", "email", "mail", "server"]
 categories = ["email"]
 license = "AGPL-3.0-only OR LicenseRef-SEL"
-version = "0.10.6"
+version = "0.10.7"
 edition = "2021"
 resolver = "2"
 
@@ -35,7 +35,7 @@ jemallocator = "0.5.0"
 
 [features]
 default = ["sqlite", "postgres", "mysql", "rocks", "elastic", "s3", "redis", "azure", "enterprise"]
-#default = ["sqlite", "postgres", "mysql", "rocks", "elastic", "s3", "redis", "foundationdb", "enterprise"]
+#default = ["rocks"]
 sqlite = ["store/sqlite"]
 foundationdb = ["store/foundation", "common/foundation"]
 postgres = ["store/postgres"]
diff --git a/crates/managesieve/Cargo.toml b/crates/managesieve/Cargo.toml
index ea5a25e7..4c7ddaf2 100644
--- a/crates/managesieve/Cargo.toml
+++ b/crates/managesieve/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "managesieve"
-version = "0.10.6"
+version = "0.10.7"
 edition = "2021"
 resolver = "2"
 
diff --git a/crates/nlp/Cargo.toml b/crates/nlp/Cargo.toml
index 7e776830..865f40a0 100644
--- a/crates/nlp/Cargo.toml
+++ b/crates/nlp/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nlp"
-version = "0.10.6"
+version = "0.10.7"
 edition = "2021"
 resolver = "2"
 
diff --git a/crates/pop3/Cargo.toml b/crates/pop3/Cargo.toml
index eb8f788c..a8fec7e0 100644
--- a/crates/pop3/Cargo.toml
+++ b/crates/pop3/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pop3"
-version = "0.10.6"
+version = "0.10.7"
 edition = "2021"
 resolver = "2"
 
diff --git a/crates/smtp/Cargo.toml b/crates/smtp/Cargo.toml
index 06d485d0..8830a331 100644
--- a/crates/smtp/Cargo.toml
+++ b/crates/smtp/Cargo.toml
@@ -7,7 +7,7 @@ homepage = "https://stalw.art/smtp"
 keywords = ["smtp", "email", "mail", "server"]
 categories = ["email"]
 license = "AGPL-3.0-only OR LicenseRef-SEL"
-version = "0.10.6"
+version = "0.10.7"
 edition = "2021"
 resolver = "2"
 
diff --git a/crates/store/Cargo.toml b/crates/store/Cargo.toml
index 287e9ce2..c94c248d 100644
--- a/crates/store/Cargo.toml
+++ b/crates/store/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "store"
-version = "0.10.6"
+version = "0.10.7"
 edition = "2021"
 resolver = "2"
 
diff --git a/crates/trc/Cargo.toml b/crates/trc/Cargo.toml
index acd7bf9b..0463ba6d 100644
--- a/crates/trc/Cargo.toml
+++ b/crates/trc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "trc"
-version = "0.10.6"
+version = "0.10.7"
 edition = "2021"
 resolver = "2"
 
diff --git a/crates/utils/Cargo.toml b/crates/utils/Cargo.toml
index 03aceaf1..1b272afd 100644
--- a/crates/utils/Cargo.toml
+++ b/crates/utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "utils"
-version = "0.10.6"
+version = "0.10.7"
 edition = "2021"
 resolver = "2"
 
diff --git a/tests/Cargo.toml b/tests/Cargo.toml
index 8f5137ec..d687fc3e 100644
--- a/tests/Cargo.toml
+++ b/tests/Cargo.toml
@@ -6,7 +6,7 @@ resolver = "2"
 
 [features]
 default = ["sqlite", "postgres", "mysql", "rocks", "elastic", "s3", "redis", "azure", "foundationdb"]
-#default = ["sqlite", "postgres", "mysql", "rocks", "elastic", "s3", "redis", "foundationdb"]
+#default = ["rocks"]
 sqlite = ["store/sqlite"]
 foundationdb = ["store/foundation", "common/foundation"]
 postgres = ["store/postgres"]
diff --git a/tests/src/jmap/mod.rs b/tests/src/jmap/mod.rs
index 2d29f81a..bdad1e1a 100644
--- a/tests/src/jmap/mod.rs
+++ b/tests/src/jmap/mod.rs
@@ -371,7 +371,7 @@ pub async fn jmap_tests() {
     .await;
 
     webhooks::test(&mut params).await;
-    /*email_query::test(&mut params, delete).await;
+    email_query::test(&mut params, delete).await;
     email_get::test(&mut params).await;
     email_set::test(&mut params).await;
     email_parse::test(&mut params).await;
@@ -396,7 +396,7 @@ pub async fn jmap_tests() {
     crypto::test(&mut params).await;
     blob::test(&mut params).await;
     permissions::test(&params).await;
-    purge::test(&mut params).await;*/
+    purge::test(&mut params).await;
     enterprise::test(&mut params).await;
 
     if delete {