diff --git a/SOURCES/mailman-2.1.12-newlist-ja.patch b/SOURCES/mailman-2.1.12-newlist-ja.patch
new file mode 100644
index 0000000..4d9eea0
--- /dev/null
+++ b/SOURCES/mailman-2.1.12-newlist-ja.patch
@@ -0,0 +1,13 @@
+diff --git a/bin/newlist b/bin/newlist
+index 3a3fd95..1d72cd5 100755
+--- a/bin/newlist
++++ b/bin/newlist
+@@ -247,7 +248,7 @@ def main():
+         try:
+             msg = Message.UserNotification(
+                 owner_mail, siteowner,
+-                C_('Your new mailing list: %(listname)s'),
++                _('Your new mailing list: %(listname)s'),
+                 text, mlist.preferred_language)
+             msg.send(mlist)
+         finally:
diff --git a/SOURCES/mailman-2.1.13-env-python.patch b/SOURCES/mailman-2.1.13-env-python.patch
deleted file mode 100644
index a34d461..0000000
--- a/SOURCES/mailman-2.1.13-env-python.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -up mailman-2.1.13/bin/msgfmt.py.env mailman-2.1.9/bin/msgfmt.py
---- mailman-2.1.13/bin/msgfmt.py.env	2010-04-13 17:01:16.000000000 +0200
-+++ mailman-2.1.13/bin/msgfmt.py	2010-04-13 17:01:22.000000000 +0200
-@@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#! /usr/bin/python
- # -*- coding: iso-8859-1 -*-
- # Written by Martin v. L�wis <loewis@informatik.hu-berlin.de>
- 
-diff -up mailman-2.1.13/Mailman/Archiver/pipermail.py.env mailman-2.1.9/Mailman/Archiver/pipermail.py
---- mailman-2.1.13/Mailman/Archiver/pipermail.py.env	2010-04-13 17:00:31.000000000 +0200
-+++ mailman-2.1.13/Mailman/Archiver/pipermail.py	2010-04-13 17:00:38.000000000 +0200
-@@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#! /usr/bin/python
- 
- from __future__ import nested_scopes
- 
-diff -up mailman-2.1.13/Mailman/Post.py.env mailman-2.1.9/Mailman/Post.py
---- mailman-2.1.13/Mailman/Post.py.env	2010-04-13 16:59:59.000000000 +0200
-+++ mailman-2.1.13/Mailman/Post.py	2010-04-13 17:00:06.000000000 +0200
-@@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#! /usr/bin/python
- #
- # Copyright (C) 2001,2002 by the Free Software Foundation, Inc.
- #
-diff -up mailman-2.1.13/tests/onebounce.py.env mailman-2.1.9/tests/onebounce.py
---- mailman-2.1.13/tests/onebounce.py.env	2010-04-13 17:01:47.000000000 +0200
-+++ mailman-2.1.13/tests/onebounce.py	2010-04-13 17:01:52.000000000 +0200
-@@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#! /usr/bin/python
- 
- # Copyright (C) 2002 by the Free Software Foundation, Inc.
- #
diff --git a/SOURCES/mailman-2.1.15-rh1351939.patch b/SOURCES/mailman-2.1.15-rh1351939.patch
new file mode 100644
index 0000000..a89bfc5
--- /dev/null
+++ b/SOURCES/mailman-2.1.15-rh1351939.patch
@@ -0,0 +1,23 @@
+=== modified file 'Mailman/Handlers/SpamDetect.py'
+--- Mailman/Handlers/SpamDetect.py	2012-02-05 21:37:29 +0000
++++ Mailman/Handlers/SpamDetect.py	2013-10-08 04:57:09 +0000
+@@ -27,6 +27,7 @@
+ 
+ import re
+ 
++from email.Errors import HeaderParseError
+ from email.Header import decode_header
+ 
+ from Mailman import mm_cfg
+@@ -68,7 +69,10 @@
+     headers = ''
+     for h, v in msg.items():
+         uvalue = u''
+-        v = decode_header(re.sub('\n\s', ' ', v))
++        try:
++            v = decode_header(re.sub('\n\s', ' ', v))
++        except HeaderParseError:
++            v = [(v, 'us-ascii')]
+         for frag, cs in v:
+             if not cs:
+                 cs = 'us-ascii'
diff --git a/SOURCES/mailman-migrate-fhs b/SOURCES/mailman-migrate-fhs
index 12c61a1..5f5874a 100755
--- a/SOURCES/mailman-migrate-fhs
+++ b/SOURCES/mailman-migrate-fhs
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 
 import sys
 import os
diff --git a/SPECS/mailman.spec b/SPECS/mailman.spec
index 248ea4e..0b921c7 100644
--- a/SPECS/mailman.spec
+++ b/SPECS/mailman.spec
@@ -4,7 +4,7 @@
 Summary: Mailing list manager with built in Web access
 Name: mailman
 Version: 2.1.15
-Release: 21%{?dist}
+Release: 24%{?dist}
 Epoch: 3
 Group: Applications/Internet
 Source0: ftp://ftp.gnu.org/pub/gnu/mailman/mailman-%{version}.tgz
@@ -38,10 +38,12 @@ Patch17: mailman-2.1.12-mmcfg.patch
 Patch18: mailman-2.1.12-initcleanup.patch
 # the service is now off by default
 Patch20: mailman-2.1.12-init-not-on.patch
-Patch21: mailman-2.1.13-env-python.patch
 Patch22: mailman-2.1.15-check_perms.patch
 Patch23: mailman-2.1.12-dmarc.patch
 Patch24: mailman-2.1.15-CVE-2015-2775.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=1351939
+Patch25: mailman-2.1.15-rh1351939.patch
+Patch26: mailman-2.1.12-newlist-ja.patch
 
 License: GPLv2+
 URL: http://www.list.org/
@@ -135,10 +137,14 @@ additional installation steps, these are described in:
 %patch17 -p1 -b .mmcfg
 %patch18 -p1 -b .initcleanup
 %patch20 -p1
-%patch21 -p1
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
+%patch25 -p0
+%patch26 -p1
+
+# Change `#!/usr/bin/env python` shebang to `#!/usr/bin/python`
+sed -i '1s|^#! */usr/bin/env python$|#!/usr/bin/python|' `find -iname '*.py'`
 
 #cp $RPM_SOURCE_DIR/mailman.INSTALL.REDHAT.in INSTALL.REDHAT.in
 cp %{SOURCE5} INSTALL.REDHAT.in
@@ -591,6 +597,16 @@ exit 0
 %dir %attr(775,root,%{mmgroup}) %{lockdir}
 
 %changelog
+* Wed Feb 22 2017 Pavel Šimerda <psimerda@redhat.com> - 3:2.1.15-24
+- Resolves: #1232737 - Fix instances of #!/usr/bin/env python in mailman
+
+* Wed Feb 22 2017 Pavel Šimerda <psimerda@redhat.com> - 3:2.1.15-23
+- Resolves: #1232749 - fix bad subject of the welcome email when creating list
+  using newlist command
+
+* Fri Feb 10 2017 Pavel Šimerda <psimerda@redhat.com> - 3:2.1.15-22
+- Resolves: #1351939 - Mailman 2.1.15 and later crashes on more email
+
 * Wed Jun 10 2015 Jan Kaluza <jkaluza@redhat.com> - 3:2.1.15-21
 - fix CVE-2015-2775 - directory traversal in MTA transports