diff --git a/src/Plugin/Mail/Maillog.php b/src/Plugin/Mail/Maillog.php
index 89fb9aa..b7e6dc4 100755
--- a/src/Plugin/Mail/Maillog.php
+++ b/src/Plugin/Mail/Maillog.php
@@ -41,7 +41,7 @@ class Maillog implements MailInterface {
 
       // In case the subject/from/to is already encoded, decode with
       // Unicode::mimeHeaderDecode().
-      $record->header_message_id = isset($message['headers']['Message-ID']) ? $message['headers']['Message-ID'] : NULL;
+      $record->header_message_id = $message['id'];
       $record->subject = $message['subject'];
       $record->subject = Unicode::mimeHeaderDecode($record->subject);
       $record->body = $message['body'];