diff --git a/.config/helix/runtime/queries/mail/highlights.scm b/.config/helix/runtime/queries/mail/highlights.scm
index 612d068c..276fcb4e 100644
--- a/.config/helix/runtime/queries/mail/highlights.scm
+++ b/.config/helix/runtime/queries/mail/highlights.scm
@@ -1,4 +1,11 @@
-(header_email) @type.builtin
+[
+(header_field_email) 
+(header_field_subject) 
+(header_field) 
+] @type.enum.variant
+
+(atom) @variable
+
 (email) @string
-(header_subject) @markup.heading
-(header_other) @markup.environment
+; (header_subject) @markup.heading
+; (header_other) @markup.environment
diff --git a/.config/helix/sample.eml b/.config/helix/sample.eml
index f0238587..ba40f4a0 100644
--- a/.config/helix/sample.eml
+++ b/.config/helix/sample.eml
@@ -1,5 +1,5 @@
 From: Daniel Fichtinger <fichtinger.d@queensu.ca>
-To: "Vice-Provost and Dean, School of Graduate Studies" <irpsurv@queensu.ca>
+To: Jeff Johnson <irpsurv@queensu.ca>
 Cc: 
 Bcc: 
 Reply-To: