diff --git a/src/mimefactory.rs b/src/mimefactory.rs
index 7025ad52c..04c3543ab 100644
--- a/src/mimefactory.rs
+++ b/src/mimefactory.rs
@@ -722,9 +722,11 @@ impl<'a> MimeFactory<'a> {
             ));
 
             if std::env::var(crate::DCC_MIME_DEBUG).is_ok() {
-                info!(context, "mimefactory: outgoing message mime:");
-                let raw_message = message.clone().build().as_string();
-                println!("{}", raw_message);
+                info!(
+                    context,
+                    "mimefactory: unencrypted message mime-body:\n{}",
+                    message.clone().build().as_string(),
+                );
             }
 
             let encrypted = encrypt_helper
@@ -782,6 +784,14 @@ impl<'a> MimeFactory<'a> {
             .into_iter()
             .fold(outer_message, |message, header| message.header(header));
 
+        if std::env::var(crate::DCC_MIME_DEBUG).is_ok() {
+            info!(
+                context,
+                "mimefactory: outgoing message mime-body:\n{}",
+                outer_message.clone().build().as_string(),
+            );
+        }
+
         let MimeFactory {
             last_added_location_id,
             ..
diff --git a/src/mimeparser.rs b/src/mimeparser.rs
index c83709673..34318a143 100644
--- a/src/mimeparser.rs
+++ b/src/mimeparser.rs
@@ -244,8 +244,11 @@ impl MimeMessage {
                     mail_raw = raw;
                     let decrypted_mail = mailparse::parse_mail(&mail_raw)?;
                     if std::env::var(crate::DCC_MIME_DEBUG).is_ok() {
-                        info!(context, "decrypted message mime-body:");
-                        println!("{}", String::from_utf8_lossy(&mail_raw));
+                        info!(
+                            context,
+                            "decrypted message mime-body:\n{}",
+                            String::from_utf8_lossy(&mail_raw),
+                        );
                     }
                     (Ok(decrypted_mail), signatures, true)
                 }
diff --git a/src/receive_imf.rs b/src/receive_imf.rs
index f09941441..971ce7e41 100644
--- a/src/receive_imf.rs
+++ b/src/receive_imf.rs
@@ -94,9 +94,12 @@ pub(crate) async fn receive_imf_inner(
 ) -> Result<Option<ReceivedMsg>> {
     info!(context, "Receiving message, seen={}...", seen);
 
-    if std::env::var(crate::DCC_MIME_DEBUG).unwrap_or_default() == "2" {
-        info!(context, "receive_imf: incoming message mime-body:");
-        println!("{}", String::from_utf8_lossy(imf_raw));
+    if std::env::var(crate::DCC_MIME_DEBUG).is_ok() {
+        info!(
+            context,
+            "receive_imf: incoming message mime-body:\n{}",
+            String::from_utf8_lossy(imf_raw),
+        );
     }
 
     let mut mime_parser =