Index: branches/version-2/data/class/SC_SendMail.php
===================================================================
--- branches/version-2/data/class/SC_SendMail.php	(revision 17092)
+++ branches/version-2/data/class/SC_SendMail.php	(revision 17216)
@@ -112,4 +112,7 @@
     function setSubject($subject) {
         $this->subject = mb_encode_mimeheader($subject);
+        $this->subject = str_replace("\x0D\x0A", "\n", $this->subject);
+        $this->subject = str_replace("\x0D", "\n", $this->subject);
+        $this->subject = str_replace("\x0A", "\n", $this->subject);
     }