diff --git a/crates/message/src/message.rs b/crates/message/src/message.rs
index 78ab0443..d2e200a7 100644
--- a/crates/message/src/message.rs
+++ b/crates/message/src/message.rs
@@ -651,7 +651,7 @@ impl Message {
             if !retain {
                 continue;
             }
-            new_data.extend_from_slice(hdr.to_header_string().as_bytes());
+            hdr.write_header(&mut new_data)?;
         }
         new_data.extend_from_slice(b"\r\n");
         new_data.extend_from_slice(&data[body_offset..]);