diff --git a/squad/core/notification.py b/squad/core/notification.py
index <HASH>..<HASH> 100644
--- a/squad/core/notification.py
+++ b/squad/core/notification.py
@@ -109,5 +109,6 @@ def __send_notification__(project, notification):
     emails = [r.email for r in recipients]
 
     message = EmailMultiAlternatives(subject, text_message, sender, emails)
-    message.attach_alternative(html_message, "text/html")
+    if project.html_mail:
+        message.attach_alternative(html_message, "text/html")
     message.send()
diff --git a/test/core/test_notification.py b/test/core/test_notification.py
index <HASH>..<HASH> 100644
--- a/test/core/test_notification.py
+++ b/test/core/test_notification.py
@@ -149,3 +149,13 @@ class TestSendNotification(TestCase):
 
         send_notification(self.project)
         self.assertEqual(2, len(mail.outbox))
+
+    def test_send_plain_text_only(self):
+        self.project.subscriptions.create(email='foo@example.com')
+        self.project.html_mail = False
+        self.project.save()
+        ProjectStatus.create_or_update(self.build2)
+
+        send_notification(self.project)
+        msg = mail.outbox[0]
+        self.assertEqual(0, len(msg.alternatives))
core/notification: send plain text-only emails