diff --git a/openerp/addons/base/ir/ir_mail_server.py b/openerp/addons/base/ir/ir_mail_server.py index 7e691a6eedd..ec5b12fc10d 100644 --- a/openerp/addons/base/ir/ir_mail_server.py +++ b/openerp/addons/base/ir/ir_mail_server.py @@ -402,9 +402,10 @@ class ir_mail_server(osv.osv): # The email's "Envelope From" (Return-Path), and all recipient addresses must only contain ASCII characters. from_rfc2822 = extract_rfc2822_addresses(smtp_from) - assert len(set(from_rfc2822)) == 1, ("Malformed 'Return-Path' or 'From' address: %r - " - "It should contain one plain ASCII email") % smtp_from - smtp_from = from_rfc2822[0] + assert from_rfc2822, ("Malformed 'Return-Path' or 'From' address: %r - " + "It should contain one valid plain ASCII email") % smtp_from + # use last extracted email, to support rarities like 'Support@MyComp ' + smtp_from = from_rfc2822[-1] email_to = message['To'] email_cc = message['Cc'] email_bcc = message['Bcc']