diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php
index ffef6abe650..bc33c0d9020 100755
--- a/htdocs/core/class/smtps.class.php
+++ b/htdocs/core/class/smtps.class.php
@@ -1142,7 +1142,7 @@ class SMTPs
 		// Make RFC821 Compliant, replace bare linefeeds
 		$strContent = preg_replace("/(?<!\r)\n/si", "\r\n", $strContent);
 
-		$strContent = rtrim(wordwrap($strContent));
+		$strContent = rtrim(wordwrap($strContent, 75, "\r\n"));
 
 		$this->_msgContent[$strType] = array();