From 4a6b42e7aa4643be3deb06b4415617d6f7344fe7 Mon Sep 17 00:00:00 2001
From: Ulrich Kleiber <ulrich.kleiber@bsz-bw.de>
Date: Wed, 5 Feb 2020 09:39:51 +0100
Subject: [PATCH] Bug 24588: Prevent e-mails from Koha to be flagged as spam

---
 C4/Installer/PerlDependencies.pm | 5 +++++
 Koha/Email.pm                    | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/C4/Installer/PerlDependencies.pm b/C4/Installer/PerlDependencies.pm
index 2225463349..10cc88ea44 100644
--- a/C4/Installer/PerlDependencies.pm
+++ b/C4/Installer/PerlDependencies.pm
@@ -104,6 +104,11 @@ our $PERL_DEPS = {
         'required' => '1',
         'min_ver'  => '1.103'
     },
+    'Email::MessageID' => {
+        'usage'    => 'Core',
+        'required' => '0',
+        'min_ver'  => '1.406'
+    },
     'Exception::Class' => {
         'usage'    => 'Core',
         'required' => '1.38',
diff --git a/Koha/Email.pm b/Koha/Email.pm
index fc392a3825..f7df72cabf 100644
--- a/Koha/Email.pm
+++ b/Koha/Email.pm
@@ -18,6 +18,7 @@
 package Koha::Email;
 
 use Modern::Perl;
+use Email::MessageID;
 
 use base qw(Class::Accessor);
 use C4::Context;
@@ -60,6 +61,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;
-- 
2.11.0