diff --git a/crates/imap/src/op/fetch.rs b/crates/imap/src/op/fetch.rs
index fa3c16ed..f97bc366 100644
--- a/crates/imap/src/op/fetch.rs
+++ b/crates/imap/src/op/fetch.rs
@@ -600,7 +600,7 @@ impl SessionData {
     }
 }
 
-trait AsImapDataItem<'x> {
+pub trait AsImapDataItem<'x> {
     fn body_structure(&self, is_extended: bool) -> BodyPart;
     fn body_section<'z: 'x>(
         &'z self,
diff --git a/crates/imap/src/op/store.rs b/crates/imap/src/op/store.rs
index b6294cc6..19644b56 100644
--- a/crates/imap/src/op/store.rs
+++ b/crates/imap/src/op/store.rs
@@ -350,7 +350,7 @@ impl SessionData {
                     }
                     Err(MethodError::ServerUnavailable) => {
                         response.rtype = ResponseType::No;
-                        response.message = "Some messaged could not be updated.".into();
+                        response.message = "Some messages could not be updated.".into();
                     }
                     Err(_) => {
                         return Err(StatusResponse::database_failure()
diff --git a/tests/src/imap/body_structure.rs b/tests/src/imap/body_structure.rs
index 11938b3c..b1553956 100644
--- a/tests/src/imap/body_structure.rs
+++ b/tests/src/imap/body_structure.rs
@@ -1,6 +1,10 @@
 use std::{fs, path::PathBuf};
 
-use imap_proto::protocol::fetch::Section;
+use imap::op::fetch::AsImapDataItem;
+use imap_proto::{
+    protocol::fetch::{BodyContents, DataItem, Section},
+    ResponseCode, StatusResponse,
+};
 use mail_parser::Message;
 
 #[test]