From af35c69a3c595ff77188ff0d7dac6ab747484ac3 Mon Sep 17 00:00:00 2001
From: Igor Tokarev <TigorC@gmail.com>
Date: Mon, 28 Aug 2017 09:28:18 +0500
Subject: Fixed #26344 -- Made EmailMessage include alternatives when the body
 is empty and it has attachments.

---
 django/core/mail/message.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'django/core')

diff --git a/django/core/mail/message.py b/django/core/mail/message.py
index eb10ff1b73..9c68b8be6d 100644
--- a/django/core/mail/message.py
+++ b/django/core/mail/message.py
@@ -354,7 +354,7 @@ class EmailMessage:
             encoding = self.encoding or settings.DEFAULT_CHARSET
             body_msg = msg
             msg = SafeMIMEMultipart(_subtype=self.mixed_subtype, encoding=encoding)
-            if self.body:
+            if self.body or body_msg.is_multipart():
                 msg.attach(body_msg)
             for attachment in self.attachments:
                 if isinstance(attachment, MIMEBase):
-- 
cgit v1.3