diff --git a/Koha/Email.pm b/Koha/Email.pm
index 58340756e8..d0c2adea74 100644
--- a/Koha/Email.pm
+++ b/Koha/Email.pm
@@ -19,6 +19,7 @@ package Koha::Email;
 
 use Modern::Perl;
 use Email::Valid;
+use Email::MessageID;
 
 use base qw(Class::Accessor);
 use C4::Context;
@@ -70,6 +71,8 @@ sub create_message_headers {
     $mail{'Message'}      = $params->{message}     if $params->{message};
     $mail{'Subject'}      = $params->{subject}     if $params->{subject};
     $mail{'Content-Type'} = $params->{contenttype} if $params->{contenttype};
+    $mail{'X-Mailer'}     = "Koha";
+    $mail{'Message-ID'}   = Email::MessageID->new->in_brackets;
     return %mail;
 }
 1;
diff --git a/cpanfile b/cpanfile
index 38a7a4fbe2..4837e7b2b3 100644
--- a/cpanfile
+++ b/cpanfile
@@ -36,6 +36,7 @@ requires 'DateTime::TimeZone', '1.20';
 requires 'Digest::MD5', '2.36';
 requires 'Digest::SHA', '5.43';
 requires 'Email::Date', '1.103';
+requires 'Email::MessageID', '1.406';
 requires 'Email::Valid', '0.190';
 requires 'Exception::Class', '1.38';
 requires 'File::Slurp', '9999.13';