diff --git a/r2/r2/lib/emailer.py b/r2/r2/lib/emailer.py
index 31a4382b1..50d1b7842 100644
--- a/r2/r2/lib/emailer.py
+++ b/r2/r2/lib/emailer.py
@@ -21,6 +21,7 @@
 ###############################################################################
 
 from email.MIMEText import MIMEText
+from email.errors import HeaderParseError
 import datetime
 import traceback, sys, smtplib
 
@@ -177,7 +178,7 @@ def send_queued_mail(test = False):
                 email.set_sent(rejected = False)
         # exception happens only for local recipient that doesn't exist
         except (smtplib.SMTPRecipientsRefused, smtplib.SMTPSenderRefused,
-                UnicodeDecodeError, AttributeError):
+                UnicodeDecodeError, AttributeError, HeaderParseError):
             # handle error and print, but don't stall the rest of the queue
             print "Handled error sending mail (traceback to follow)"
             traceback.print_exc(file = sys.stdout)