diff --git a/phpgwapi/inc/class.send.inc.php b/phpgwapi/inc/class.send.inc.php
index 551e6144ec..46e25cadc9 100644
--- a/phpgwapi/inc/class.send.inc.php
+++ b/phpgwapi/inc/class.send.inc.php
@@ -164,6 +164,9 @@
 		*/
 		function encode_subject($subject)
 		{
+			// remove unnecessary CR's as some mail-scanners complain about them
+			$subject = str_replace("\r",'',$subject);
+
 			$enc_start = $enc_end = 0;
 
 			$words = explode(' ',$subject);