diff --git a/.config/helix/runtime/queries/mail/highlights.scm b/.config/helix/runtime/queries/mail/highlights.scm
index 276fcb4e..48c064fb 100644
--- a/.config/helix/runtime/queries/mail/highlights.scm
+++ b/.config/helix/runtime/queries/mail/highlights.scm
@@ -1,11 +1,20 @@
+; header fields
 [
-(header_field_email) 
-(header_field_subject) 
-(header_field) 
-] @type.enum.variant
+  (header_field_email)
+  (header_field_subject)
+  (header_field)
+] @keyword
+
+(header_separator) @punctuation.delimiter
+
+(header_subject
+  (header_unstructured) @markup.heading)
+(header_other
+  (header_unstructured) @comment)
 
 (atom) @variable
 
 (email) @string
+
 ; (header_subject) @markup.heading
 ; (header_other) @markup.environment