diff --git a/syntax/Syntax b/syntax/Syntax

index efdd50e..4f7dfed 100644

--- a/syntax/Syntax

+++ b/syntax/Syntax

@@ -145,7 +145,7 @@ include lua.syntax

 file ..\*\\.([iI][dD][lL])$ CORBA\sIDL

 include idl.syntax

-file Don_t_match_me Mail\sfolder ^From\s

+file Don_t_match_me Mail\sfolder ^(From|Return-(P|p)ath:|From:|Date:)\s

 include mail.syntax

 file .\* unknown

diff --git a/syntax/mail.syntax b/syntax/mail.syntax

index dee51ee..3ca43db 100644

--- a/syntax/mail.syntax

+++ b/syntax/mail.syntax

@@ -4,32 +4,71 @@ context default

     spellcheck

 context linestart From\s \n\n cyan black

+    keyword linestart From: brightgreen

     keyword linestart From\s brightred

-    keyword linestart Received: brightcyan

-    keyword linestart Date: green

+    keyword <*@*> white

+    keyword whole +@+ white

+    keyword linestart To: brightmagenta

+    keyword linestart Subject: brightred/Orange

+    keyword linestart +: brown

+

+context linestart Return-path:\s \n\n cyan black

     keyword linestart From: brightgreen

+    keyword linestart From\s brightred

+    keyword <*@*> white

+    keyword whole +@+ white

     keyword linestart To: brightmagenta

-    keyword linestart Cc: magenta

-    keyword linestart Subject: brightred

-    keyword linestart Message-ID: red

-    keyword linestart In-Reply-To: yellow

-    keyword linestart References: yellow

-    keyword linestart MIME-Version: brightblue

-    keyword linestart Mime-Version: brightblue

-    keyword linestart Content-Type: brightblue

-    keyword linestart Content-Disposition: brightblue

-    keyword linestart Content-Transfer-Encoding: brightblue

+    keyword linestart Subject: brightred/Orange

     keyword linestart +: brown

+

+context linestart Return-Path:\s \n\n cyan black

+    keyword linestart From: brightgreen

+    keyword linestart From\s brightred

     keyword <*@*> white

     keyword whole +@+ white

+    keyword linestart To: brightmagenta

+    keyword linestart Subject: brightred/Orange

+    keyword linestart +: brown

-context linestart >\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]> \n brightcyan

+context linestart From:\s \n\n cyan black

+    keyword linestart From: brightgreen

+    keyword linestart From\s brightred

+    keyword <*@*> white

+    keyword whole +@+ white

+    keyword linestart To: brightmagenta

+    keyword linestart Subject: brightred/Orange

+    keyword linestart +: brown

+

+context linestart Date:\s \n\n cyan black

+    keyword linestart From: brightgreen

+    keyword linestart From\s brightred

+    keyword <*@*> white

+    keyword whole +@+ white

+    keyword linestart To: brightmagenta

+    keyword linestart Subject: brightred/Orange

+    keyword linestart +: brown

+

+context linestart >\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]> \n brightgreen

+context linestart >\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]> \n brightred

+context linestart >\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]> \n brightgreen

+context linestart >\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]> \n brightred

+context linestart >\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]> \n brightgreen

+context linestart >\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]> \n brightred

+context linestart >\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]> \n brightgreen

+context linestart >\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]> \n brightred

+context linestart >\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]> \n brightgreen

+context linestart >\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]> \n brightred

+context linestart >\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]> \n brightgreen

+context linestart >\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]> \n brightred

+context linestart >\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]> \n brightgreen

+context linestart >\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]> \n brightred

 context linestart >\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]> \n brightgreen

-context linestart >\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]> \n brightcyan

+context linestart >\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]> \n brightred

 context linestart >\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]> \n brightgreen

-context linestart >\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]> \n brightcyan

+context linestart >\[\s\]>\[\s\]>\[\s\]>\[\s\]>\[\s\]> \n brightred

 context linestart >\[\s\]>\[\s\]>\[\s\]>\[\s\]> \n brightgreen

-context linestart >\[\s\]>\[\s\]>\[\s\]> \n brightcyan

+context linestart >\[\s\]>\[\s\]>\[\s\]> \n brightred

 context linestart >\[\s\]>\[\s\]> \n brightgreen

-context linestart >\[\s\]> \n brightcyan

+context linestart >\[\s\]> \n brightred

 context linestart > \n brightgreen

+