diff --git a/plugins/notifier/email/MessageNotifierEmail.class.php b/plugins/notifier/email/MessageNotifierEmail.class.php
index b0e5da4..5aaf98a 100644
--- a/plugins/notifier/email/MessageNotifierEmail.class.php
+++ b/plugins/notifier/email/MessageNotifierEmail.class.php
@@ -22,9 +22,15 @@ class MessageNotifierEmail extends MessageNotifierBase {
       $lang = $languages[$message->language];
     }
 
+    // Start with basic clean-up to remove line-feeds etc
+    $output['message_notify_email_subject'] = trim($output['message_notify_email_subject']);
+
     // The subject in an email can't be with HTML, so strip it.
     $output['message_notify_email_subject'] = strip_tags($output['message_notify_email_subject']);
 
+    // decode entities
+    $output['message_notify_email_subject'] = html_entity_decode($output['message_notify_email_subject']);
+
     // Pass the message entity along to hook_drupal_mail().
     $output['message_entity'] = $message;