From 36097ea986f975fd20af2398f28e60670faf3293 Mon Sep 17 00:00:00 2001
From: Mark Sapiro <mark@msapiro.net>
Date: Mon, 14 Dec 2015 14:25:18 -0800
Subject: Ensure white space following subject_prefix.

---
 Mailman/Handlers/CookHeaders.py | 5 +++++
 NEWS                            | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/Mailman/Handlers/CookHeaders.py b/Mailman/Handlers/CookHeaders.py
index acb79166..4e005dc5 100755
--- a/Mailman/Handlers/CookHeaders.py
+++ b/Mailman/Handlers/CookHeaders.py
@@ -425,6 +425,11 @@ def prefix_subject(mlist, msg, msgdata):
         except UnicodeError:
             pass
     # Get the header as a Header instance, with proper unicode conversion
+    # Because of rfc2047 encoding, spaces between encoded words can be
+    # insignificant, so we need to append a space to prefix but only when
+    # we have Re:.
+    if recolon:
+        prefix += ' '
     if old_style:
         h = uheader(mlist, recolon, 'Subject', continuation_ws=ws)
         h.append(prefix)
diff --git a/NEWS b/NEWS
index 254d6047..367651ea 100755
--- a/NEWS
+++ b/NEWS
@@ -21,6 +21,10 @@ Here is a history of user visible changes to Mailman.
       de Mello.
 
   Bug fixes and other patches
+
+    - Fixed an issue that sometimes left no white space following
+      subject_prefix.  (LP: #1525954)
+
     - Vette log entries for banned subscriptions now include the source of
       the request if available.  (LP: #1525733)
 
-- 
cgit v1.2.3