summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--django/core/mail.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/django/core/mail.py b/django/core/mail.py
index 4794f9d5bb..8fcf26fe03 100644
--- a/django/core/mail.py
+++ b/django/core/mail.py
@@ -6,12 +6,17 @@ from django.conf import settings
from email.MIMEText import MIMEText
from email.Header import Header
from email.Utils import formatdate
+from email import Charset
import os
import smtplib
import socket
import time
import random
+# Don't BASE64-encode UTF-8 messages so that we avoid unwanted attention from
+# some spam filters.
+Charset.add_charset('utf-8', Charset.SHORTEST, Charset.QP, 'utf-8')
+
# Cache the hostname, but do it lazily: socket.getfqdn() can take a couple of
# seconds, which slows down the restart of the server.
class CachedDnsName(object):