From dba36ac3e5a63c400c82c293c71c8598354f3253 Mon Sep 17 00:00:00 2001
From: Gabriel Gimenez Catuogno <12-11006@usb.ve>
Date: Fri, 25 Aug 2017 17:00:23 +0200
Subject: [PATCH 1/2] Fix replace, add

---
 ckan/lib/mailer.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ckan/lib/mailer.py b/ckan/lib/mailer.py
index c75e3435e96..738eb19ec6e 100644
--- a/ckan/lib/mailer.py
+++ b/ckan/lib/mailer.py
@@ -33,7 +33,10 @@ def _mail_recipient(recipient_name, recipient_email,
     mail_from = config.get('smtp.mail_from')
     msg = MIMEText(body.encode('utf-8'), 'plain', 'utf-8')
     for k, v in headers.items():
-        msg[k] = v
+        if k in msg.keys():
+            msg.replace_header(k, v)
+        else:
+            msg.add_header(k, v)
     subject = Header(subject.encode('utf-8'), 'utf-8')
     msg['Subject'] = subject
     msg['From'] = _("%s <%s>") % (sender_name, mail_from)

From 627d7ba3caaa5864bd4013e28ccfb2ca5c2da0f5 Mon Sep 17 00:00:00 2001
From: Gabriel Gimenez Catuogno <12-11006@usb.ve>
Date: Fri, 25 Aug 2017 17:03:40 +0200
Subject: [PATCH 2/2] Unused import

---
 ckan/lib/mailer.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ckan/lib/mailer.py b/ckan/lib/mailer.py
index 738eb19ec6e..4979ea8eb77 100644
--- a/ckan/lib/mailer.py
+++ b/ckan/lib/mailer.py
@@ -8,7 +8,6 @@
 from email.mime.text import MIMEText
 from email.header import Header
 from email import Utils
-from urlparse import urljoin
 
 from ckan.common import config
 import paste.deploy.converters