diff --git a/melib/src/jmap/mailbox.rs b/melib/src/jmap/backend_mailbox.rs
similarity index 100%
rename from melib/src/jmap/mailbox.rs
rename to melib/src/jmap/backend_mailbox.rs
diff --git a/melib/src/jmap/mod.rs b/melib/src/jmap/mod.rs
index a4246a6c..5f233f1d 100644
--- a/melib/src/jmap/mod.rs
+++ b/melib/src/jmap/mod.rs
@@ -95,9 +95,11 @@ use rfc8620::{
     QueryResponse, Set, SetResponse, State, UploadResponse,
 };
 
+pub mod backend_mailbox;
+use backend_mailbox::JmapMailbox;
+
 pub mod mailbox;
 pub mod objects;
-use mailbox::JmapMailbox;
 
 pub fn deserialize_from_str<'de, T: serde::de::Deserialize<'de>>(s: &'de str) -> Result<T> {
     let jd = &mut serde_json::Deserializer::from_str(s);
diff --git a/melib/src/jmap/protocol.rs b/melib/src/jmap/protocol.rs
index 2f961636..fe09f775 100644
--- a/melib/src/jmap/protocol.rs
+++ b/melib/src/jmap/protocol.rs
@@ -35,8 +35,8 @@ use crate::{
     email::Envelope,
     error::Result,
     jmap::{
+        backend_mailbox::JmapMailbox,
         deserialize_from_str,
-        mailbox::JmapMailbox,
         objects::{
             email::{EmailFilterCondition, EmailGet, EmailObject, EmailQuery},
             mailbox::{MailboxGet, MailboxObject},