diff --git a/lib/postal/message_db/message.rb b/lib/postal/message_db/message.rb
index c01ba3e..db70c3b 100644
--- a/lib/postal/message_db/message.rb
+++ b/lib/postal/message_db/message.rb
@@ -535,7 +535,9 @@ module Postal
         if parse_result.actioned?
           #  Somethign was changed, update the raw message
           @database.update(raw_table, { data: parse_result.new_body }, where: { id: raw_body_id })
+          @database.update(raw_table, { data: parse_result.new_headers }, where: { id: raw_headers_id })
           @raw = parse_result.new_body
+          @raw_headers = parse_result.new_headers
           @raw_message = nil
         end
         update("parsed" => 1, "tracked_links" => parse_result.tracked_links, "tracked_images" => parse_result.tracked_images)
diff --git a/lib/postal/message_parser.rb b/lib/postal/message_parser.rb
index 386521b..cad8601 100644
--- a/lib/postal/message_parser.rb
+++ b/lib/postal/message_parser.rb
@@ -14,7 +14,7 @@ module Postal
 
       return unless @domain
 
-      @parsed_output = generate
+      @parsed_output = generate.split("\r\n\r\n", 2)
     end
 
     attr_reader :tracked_links
@@ -25,7 +25,11 @@ module Postal
     end
 
     def new_body
-      @parsed_output.split("\r\n\r\n", 2)[1]
+      @parsed_output[1]
+    end
+
+    def new_headers
+      @parsed_output[0]
     end
 
     private