diff --git a/pkg/message/parser.go b/pkg/message/parser.go
index 5048202a..45aeb157 100644
--- a/pkg/message/parser.go
+++ b/pkg/message/parser.go
@@ -315,6 +315,9 @@ func parseHeader(m *pmapi.Message, h message.Header) error {
 			return err
 		}
 
+		// TODO: Is this okay? Might need to append/split/something.
+		m.Header[fields.Key()] = []string{text}
+
 		switch strings.ToLower(fields.Key()) {
 		case "subject":
 			m.Subject = text