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

addons/crm_claim/test/process/claim.yml

@@ -15,7 +15,7 @@
     claim_ids = self.search(cr, uid, [('email_from','=', 'Mr. John Right <info@customer.com>')])
     assert claim_ids and len(claim_ids), "Claim is not created after getting request"
     claim = self.browse(cr, uid, claim_ids[0], context=context)
-    assert claim.name == tools.ustr("demande derèglement de votre produit."), "Subject does not match"
+    assert claim.name == tools.ustr("demande de règlement de votre produit."), "Subject does not match"
 -
   I open customer claim.
 -

addons/mail/mail_message.py

@@ -39,7 +39,9 @@ def decode(text):
     """Returns unicode() string conversion of the the given encoded smtp header text"""
     if text:
         text = decode_header(text.replace('\r', ''))
-        return ''.join([tools.ustr(x[0], x[1]) for x in text])
+        # 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):
     def __init__(self):