diff --git a/core/attributedef.class.inc.php b/core/attributedef.class.inc.php
index 0588ce7cf..3d0158c0f 100644
--- a/core/attributedef.class.inc.php
+++ b/core/attributedef.class.inc.php
@@ -2915,10 +2915,10 @@ class AttributeCaseLog extends AttributeLongText
 			return $value->GetText();
 			
 			case 'head':
-			return $value->GetLatestEntry();
+			return $value->GetLatestEntry('text');
 
 			case 'head_html':
-			return '<div class="caselog_entry">'.str_replace( array( "\r\n", "\n", "\r"), "<br/>", htmlentities($value->GetLatestEntry(), ENT_QUOTES, 'UTF-8')).'</div>';
+			return $value->GetLatestEntry('html');
 			
 			case 'html':
 			return $value->GetAsEmailHtml();
diff --git a/core/ormcaselog.class.inc.php b/core/ormcaselog.class.inc.php
index 39e0e7613..d9ec1dcfa 100644
--- a/core/ormcaselog.class.inc.php
+++ b/core/ormcaselog.class.inc.php
@@ -651,12 +651,38 @@ class ormCaseLog {
 
 	/**
 	 * Get the latest entry from the log
+	 * @param string The expected output format text|html
 	 * @return string
 	 */
-	public function GetLatestEntry()
+	public function GetLatestEntry($sFormat = 'text')
 	{
+		$sRes = '';
 		$aLastEntry = end($this->m_aIndex);
-		$sRes = substr($this->m_sLog, $aLastEntry['separator_length'], $aLastEntry['text_length']);
+		$sRaw = substr($this->m_sLog, $aLastEntry['separator_length'], $aLastEntry['text_length']);
+		switch($sFormat)
+		{
+			case 'text':
+			if ($aLastEntry['format'] == 'text')
+			{
+				$sRes = $sRaw;
+			}
+			else
+			{
+				$sRes = utils::HtmlToText($sRaw);
+			}
+			break;
+			
+			case 'html':
+			if ($aLastEntry['format'] == 'text')
+			{
+				$sRes = utils::TextToHtml($sRaw);
+			}
+			else
+			{
+				$sRes = $sRaw;
+			}
+			break;
+		}
 		return $sRes;
 	}