_max_append(): When adding the string `s' to its own line, it should

be lstrip'd so that old continuation whitespace is replaced by that
specified in Header's continuation_ws parameter.

diff --git a/Lib/email/quopriMIME.py b/Lib/email/quopriMIME.py
index afd2e5ec5ac64d4ca827948f0cf5a3b278287d5a..1559c0e3f3c285b3e9b34dde16c82d08652d0893 100644 (file)
--- a/Lib/email/quopriMIME.py
+++ b/Lib/email/quopriMIME.py
@@ -75,11 +75,11 @@ def body_quopri_len(str):
 
 def _max_append(L, s, maxlen, extra=''):
     if not L:
-        L.append(s)
+        L.append(s.lstrip())
     elif len(L[-1]) + len(s) < maxlen:
         L[-1] += extra + s
     else:
-        L.append(s)
+        L.append(s.lstrip())
 
 
 def unquote(s):