BUG: Plaintext version of message is cut off

Author: nadine-belanova

lib/MailSo/Base/HtmlUtils.php

@@ -766,8 +766,6 @@ public static function ConvertHtmlToPlain($sText)
 				'/<th[^>]*>(.+?)<\/th>/i',
 				'/&nbsp;/i',
 				'/&quot;/i',
-				'/&gt;/i',
-				'/&lt;/i',
 				'/&amp;/i',
 				'/&copy;/i',
 				'/&trade;/i',
@@ -810,8 +808,6 @@ public static function ConvertHtmlToPlain($sText)
 				"\t\\1\n",
 				' ',
 				'"',
-				'>',
-				'<',
 				'&',
 				'(c)',
 				'(tm)',
@@ -835,9 +831,18 @@ public static function ConvertHtmlToPlain($sText)
 
 		$sText = str_ireplace('<div>',"\n<div>", $sText);
 		$sText = strip_tags($sText, '');
+		
+		// angle brackets must be replaced after the strip_tags function call to prevent replacing some text after < symbol
+		$sText = preg_replace(array(
+				'/&gt;/i',
+				'/&lt;/i',
+			), array(
+				'>',
+				'<',
+			), $sText);
+		
 		$sText = preg_replace("/\n\\s+\n/", "\n", $sText);
 		$sText = preg_replace("/[\n]{3,}/", "\n\n", $sText);
-
 		return trim($sText);
 	}