Ticket #11144: bug11144.patch

django/core/mail.py

@@ -13 +13 @@
 from email.MIMEMultipart import MIMEMultipart
 from email.MIMEBase import MIMEBase
 from email.Header import Header
-from email.Utils import formatdate, parseaddr, formataddr
+from email.Utils import formatdate, parseaddr, formataddr, getaddresses
 
 from django.conf import settings
 from django.utils.encoding import smart_str, force_unicode
@@ -79 +79 @@
     except UnicodeEncodeError:
         if name.lower() in ('to', 'from', 'cc'):
             result = []
-            for item in val.split(', '):
-                nm, addr = parseaddr(item)
+            for nm,addr in getaddresses( (val,) ):
                 nm = str(Header(nm, settings.DEFAULT_CHARSET))
                 result.append(formataddr((nm, str(addr))))
             val = ', '.join(result)