[MERGE] forward port of branch saas-3 up to ffc40b6

addons/mail/mail_message.py

@@ -39,6 +39,8 @@ def decode(text):
     """Returns unicode() string conversion of the the given encoded smtp header text"""
     if text:
         text = decode_header(text.replace('\r', ''))
+        # The joining space will not be needed as of Python 3.3
+        # See https://hg.python.org/cpython/rev/8c03fe231877
         return ' '.join([tools.ustr(x[0], x[1]) for x in text])
 
 class MLStripper(HTMLParser):