diff --git a/application/portalwebpage.class.inc.php b/application/portalwebpage.class.inc.php
index 5e96226df..09471e7a2 100644
--- a/application/portalwebpage.class.inc.php
+++ b/application/portalwebpage.class.inc.php
@@ -170,7 +170,7 @@ try
 	});
 
 	//$('.resizable').resizable(); // Make resizable everything that claims to be resizable !
-	$('.caselog_header').click( function () { $(this).toggleClass('open').next('.caselog_entry').toggle(); });
+	$('.caselog_header').click( function () { $(this).toggleClass('open').next('.caselog_entry_html').toggle(); });
 			
 	$(document).ajaxSend(function(event, jqxhr, options) {
 		jqxhr.setRequestHeader('X-Combodo-Ajax', 'true');
diff --git a/portal/index.php b/portal/index.php
index 8232d5f15..a3e262619 100644
--- a/portal/index.php
+++ b/portal/index.php
@@ -1122,6 +1122,20 @@ EOF
 		$oP->add('<h1>'.$aEditFields[$sLogAttCode]['label'].'</h1>');
 		$oP->add($aEditFields[$sLogAttCode]['value']);
 		$oP->add('</div>');
+		// Replace the text area with CKEditor
+		// To change the default settings of the editor,
+		// a) edit the file /js/ckeditor/config.js
+		// b) or override some of the configuration settings, using the second parameter of ckeditor()
+		$aConfig = array();
+		$sLanguage = strtolower(trim(UserRights::GetUserLanguage()));
+		$aConfig['font_style'] = $sLanguage;
+		$aConfig['language'] = $sLanguage;
+		$aConfig['contentsLanguage'] = $sLanguage;
+		$aConfig['extraPlugins'] = 'disabler';
+		$aConfig['placeholder'] = Dict::S('UI:CaseLogTypeYourTextHere');
+		$sConfigJS = json_encode($aConfig);
+		
+		$oP->add_ready_script("$('#input_$sLogAttCode').ckeditor(function() { /* callback code */ }, $sConfigJS);"); // Transform $iId into a CKEdit
 	}
 	else
 	{
@@ -1133,7 +1147,8 @@ EOF
 
 	$oP->add('</table>');
 	$oP->add('</div>');
-
+	
+	$oP->add_ready_script(InlineImage::EnableCKEditorImageUpload($oObj, 'zzzzz'));
 	$oP->WizardFormEnd();
 	$oP->add('</div>');
 }
diff --git a/portal/portal.css b/portal/portal.css
index 5613345ed..32b6b9596 100644
--- a/portal/portal.css
+++ b/portal/portal.css
@@ -232,3 +232,6 @@ div.edit_item span div table tbody tr td textarea{
 div#ticket_shortcuts form {
 	display: inline-block;
 }
+.cke_contents {
+	border: 1px #C8C9CA solid !important;
+}
\ No newline at end of file