diff --git a/msg_parser/email_builder.py b/msg_parser/email_builder.py
index 7936481..2b8c0c5 100644
--- a/msg_parser/email_builder.py
+++ b/msg_parser/email_builder.py
@@ -21,6 +21,18 @@ def build_email(self):
 
         # Setting Message ID
         self.message.set_param("Message-ID", self.msg_obj.message_id)
+        
+        message_ID = self.msg_obj.message_id
+        if message_ID:
+            self.message["Message-ID"] = str(message_ID)
+        
+        references = self.msg_obj.header_dict.get("References")
+        if references:
+            self.message["References"] = str(references)
+        
+        in_reply_to = self.msg_obj.header_dict.get("In-Reply-To")
+        if in_reply_to:
+            self.message["In-Reply-To"] = str(in_reply_to)
 
         # Encoding for unicode subject
         self.message["Subject"] = Header(self.msg_obj.subject, charset="UTF-8")
diff --git a/msg_parser/msg_parser.py b/msg_parser/msg_parser.py
index b96e2fc..07e8536 100644
--- a/msg_parser/msg_parser.py
+++ b/msg_parser/msg_parser.py
@@ -376,9 +376,8 @@ def get_email_mime_content(self):
 
     def save_email_file(self, file_path, file_name=None):
         email_obj = EmailFormatter(self)
-        email_obj.save_file(file_path, file_name)
-        return True
-
+        return email_obj.save_file(file_path)
+        
     def _set_properties(self):
         property_values = self._message.properties