diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index 51659416e30..28ee4408836 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -1062,8 +1062,8 @@ class CMailFile
 		if ($this->msgishtml)
 		{
 			// Similar code to forge a text from html is also in CMailFile.class.php
-			$strContentAltText = html_entity_decode(strip_tags($strContent));
 			$strContentAltText = preg_replace("/<br\s*[^>]*>/"," ", $strContentAltText);
+			$strContentAltText = html_entity_decode(strip_tags($strContent));
 			$strContentAltText = rtrim(wordwrap($strContentAltText, 75, empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA)?"\r\n":"\n"));
 
 			// Check if html header already in message, if not complete the message
diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php
index 076e307263f..8c7775a16ed 100644
--- a/htdocs/core/class/smtps.class.php
+++ b/htdocs/core/class/smtps.class.php
@@ -1361,8 +1361,8 @@ class SMTPs
 		if ($strType == 'html')
 		{
 			// Similar code to forge a text from html is also in CMailFile.class.php
-			$strContentAltText = html_entity_decode(strip_tags($strContent));
 			$strContentAltText = preg_replace("/<br\s*[^>]*>/"," ", $strContentAltText);
+			$strContentAltText = html_entity_decode(strip_tags($strContent));
 			$strContentAltText = rtrim(wordwrap($strContentAltText, 75, "\r\n"));
 		}