diff --git a/src/rfc5322/core.clj b/src/rfc5322/core.clj
index ac9c6fa..15e170e 100644
--- a/src/rfc5322/core.clj
+++ b/src/rfc5322/core.clj
@@ -8,7 +8,7 @@
 
 (defn log-and-passthrough
   [x level msg]
-  (log/log! level :p [msg])
+  (log/log level (str msg x))
   x)
 
 (defn convert
diff --git a/src/rfc5322/parser.clj b/src/rfc5322/parser.clj
index cf3ef77..4b18278 100644
--- a/src/rfc5322/parser.clj
+++ b/src/rfc5322/parser.clj
@@ -36,9 +36,8 @@
   and nil otherwise. Because RFC 5322 is ambiguous, the returned parse tree
   is the one with the least number of obsolete tokens."
   [message-text mode]
-  (log/debugf "Parsing message \n%s\nUsing %s mode ..."
-              message-text
-              mode)
+  (log/debugf "Parsing message using %s mode ..." mode)
+  (log/tracef "Parsing message:\n"  message-text)
   (let [result (instaparse/parse (make-parser mode) message-text)]
     (if (instaparse/failure? result)
       (throw (new ParserException "Parse failure" (instaparse/get-failure result)))
diff --git a/src/rfc5322/xform.clj b/src/rfc5322/xform.clj
index 8b841d2..0461df3 100644
--- a/src/rfc5322/xform.clj
+++ b/src/rfc5322/xform.clj
@@ -40,8 +40,8 @@
 
   Note that this is by no means definitive or complete!"
   [xs]
-  (log/tracef "Preparing to convert the following to a map:\n"
-              xs)
+  ; (log/trace "Preparing to convert the following to a map:\n"
+  ;            xs)
   (instaparse/transform
     {:LF str
      :line-feeds str