1 files changed, 6 insertions, 2 deletions
diff --git a/lib/MaildirIndexer/Parser.pm6 b/lib/MaildirIndexer/Parser.pm6
index 90b3678..c2425fe 100644
--- a/lib/MaildirIndexer/Parser.pm6
+++ b/lib/MaildirIndexer/Parser.pm6
@@ -1,5 +1,6 @@
 use v6.d.PREVIEW;
 unit module MaildirIndexer::Parser;
+use MaildirIndexer::Email;
 
 my @separators = (
     "\x0a\x0d\x0a\x0d",
@@ -38,13 +39,16 @@ grammar Message {
 
 class Message-actions {
     method TOP($/) {
-        make %( headers => $/<headers>.made, body => $/<body>.Str );
+        make MaildirIndexer::Email.new(
+            headers => $/<headers>.made,
+            body => $/<body>.Str,
+        );
     }
     method headers($/) {
         make %( |$/<header>».made );
     }
     method header($/) {
-        make $/<junk> ?? () !! ( $/<name>.Str => $/<value>.made );
+        make $/<junk> ?? () !! ( $/<name>.Str.lc => $/<value>.made );
     }
     method value($/) {
         make $/<line>.join(' ')