[MERGE] forward port branch 10.0 up to 2fc46a064d

2019-08-19 10:24:42 +02:00
parent 14547f847c 2fc46a064d
commit b6deb72747
1 changed files with 1 additions and 1 deletions
@@ -1496,7 +1496,7 @@ class MailThread(models.AbstractModel):
            # Very unusual situation, be we should be fault-tolerant here
            message_id = "<%s@localhost>" % time.time()
            _logger.debug('Parsing Message without message-id, generating a random one: %s', message_id)
-        msg_dict['message_id'] = message_id
+        msg_dict['message_id'] = message_id.strip()

        if message.get('Subject'):
            msg_dict['subject'] = tools.decode_smtp_header(message.get('Subject'))