diff --git a/crates/directory/src/backend/internal/lookup.rs b/crates/directory/src/backend/internal/lookup.rs
index 173a8edde..d718dad92 100644
--- a/crates/directory/src/backend/internal/lookup.rs
+++ b/crates/directory/src/backend/internal/lookup.rs
@@ -135,7 +135,8 @@ impl DirectoryStore for Store {
                     Ok(true)
                 },
             )
-            .await.caused_by(trc::location!())?;
+            .await
+            .caused_by(trc::location!())?;
         }
 
         Ok(results)
diff --git a/crates/jmap/src/api/management/queue.rs b/crates/jmap/src/api/management/queue.rs
index beddd94d1..35042a8ca 100644
--- a/crates/jmap/src/api/management/queue.rs
+++ b/crates/jmap/src/api/management/queue.rs
@@ -206,7 +206,9 @@ impl QueueManagement for Server {
                     .iterate(
                         IterateParams::new(from_key, to_key).ascending(),
                         |key, value| {
-                            let message = Bincode::<queue::Message>::deserialize(value)?.inner;
+                            let message = Bincode::<queue::Message>::deserialize(value)
+                                .add_context(|ctx| ctx.ctx(trc::Key::Key, key))?
+                                .inner;
                             let matches = tenant_domains
                                 .as_ref()
                                 .map_or(true, |domains| message.has_domain(domains))
diff --git a/crates/jmap/src/api/management/report.rs b/crates/jmap/src/api/management/report.rs
index 12c3d89cf..331e54ef8 100644
--- a/crates/jmap/src/api/management/report.rs
+++ b/crates/jmap/src/api/management/report.rs
@@ -227,7 +227,8 @@ impl ManageReports for Server {
                             Ok(max_total == 0 || total < max_total)
                         },
                     )
-                    .await.caused_by(trc::location!())?;
+                    .await
+                    .caused_by(trc::location!())?;
 
                 Ok(JsonResponse::new(json!({
                         "data": {
diff --git a/crates/jmap/src/services/index.rs b/crates/jmap/src/services/index.rs
index 7b784e6da..4381856e4 100644
--- a/crates/jmap/src/services/index.rs
+++ b/crates/jmap/src/services/index.rs
@@ -118,7 +118,9 @@ impl Indexer for Server {
             )
             .await
             .map_err(|err| {
-                trc::error!(err.caused_by(trc::location!()).details("Failed to iterate over index emails"));
+                trc::error!(err
+                    .caused_by(trc::location!())
+                    .details("Failed to iterate over index emails"));
             });
 
         // Add entries to the index
diff --git a/crates/smtp/src/reporting/dmarc.rs b/crates/smtp/src/reporting/dmarc.rs
index 646dec15c..08f74a403 100644
--- a/crates/smtp/src/reporting/dmarc.rs
+++ b/crates/smtp/src/reporting/dmarc.rs
@@ -559,7 +559,8 @@ impl DmarcReporting for Server {
                     }
                 },
             )
-            .await.caused_by(trc::location!())?;
+            .await
+            .caused_by(trc::location!())?;
 
         for (record, count) in record_map {
             report = report.with_record(record.with_count(count));
diff --git a/crates/smtp/src/reporting/tls.rs b/crates/smtp/src/reporting/tls.rs
index 9a0c87620..70333102c 100644
--- a/crates/smtp/src/reporting/tls.rs
+++ b/crates/smtp/src/reporting/tls.rs
@@ -366,7 +366,8 @@ impl TlsReporting for Server {
                         Ok(true)
                     }
                 })
-                .await.caused_by(trc::location!())?;
+                .await
+                .caused_by(trc::location!())?;
 
             // Add policy
             report.policies.push(Policy {