diff --git a/jdav_web/mailer/models.py b/jdav_web/mailer/models.py
index 36a76b5..f82a276 100644
--- a/jdav_web/mailer/models.py
+++ b/jdav_web/mailer/models.py
@@ -90,6 +90,9 @@ class Message(models.Model):
         emails = [member.email for member in filtered]
         emails.extend([member.email_parents for member in filtered
                        if member.email_parents])
+        # remove any underscores from subject to prevent Arne from using
+        # terrible looking underscores in subjects
+        self.subject = self.subject.replace('_', ' ')
         success = send(self.subject, get_content(self.content),
                        SENDING_ADDRESS,
                        emails,