diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WStringEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WStringEditor.java
index 52956b99f9..5fa10261d5 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WStringEditor.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WStringEditor.java
@@ -225,6 +225,7 @@ public class WStringEditor extends WEditor implements ContextMenuListener
 			final WTextEditorDialog dialog = new WTextEditorDialog(this.getColumnName(), getDisplay(),
 					isReadWrite(), gridField.getFieldLength());
 			dialog.setAttribute(Window.MODE_KEY, Window.MODE_HIGHLIGHTED);
+			dialog.setSizable(true);
 			dialog.addEventListener(DialogEvents.ON_WINDOW_CLOSE, new EventListener<Event>() {
 				@Override
 				public void onEvent(Event event) throws Exception {
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WTextEditorDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WTextEditorDialog.java
index 26caec2e4b..64a81dfcd2 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WTextEditorDialog.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WTextEditorDialog.java
@@ -22,7 +22,6 @@ import org.adempiere.webui.component.Tabs;
 import org.adempiere.webui.component.Textbox;
 import org.adempiere.webui.component.VerticalBox;
 import org.adempiere.webui.component.Window;
-import org.zkforge.ckez.*;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.EventListener;
 import org.zkoss.zk.ui.event.Events;
@@ -30,6 +29,8 @@ import org.zkoss.zul.Div;
 import org.zkoss.zul.Html;
 import org.zkoss.zul.Separator;
 
+import fi.jawsy.jawwa.zk.cleditor.Cleditor;
+
 /**
  * 
  * @author Low Heng Sin
@@ -47,7 +48,7 @@ public class WTextEditorDialog extends Window implements EventListener<Event>{
 	private boolean cancelled;
 	private Tabbox tabbox;
 	private Textbox textBox;
-	private CKeditor editor;
+	private Cleditor editor;
 	private Label status;
 
 	/**
@@ -99,7 +100,7 @@ public class WTextEditorDialog extends Window implements EventListener<Event>{
 		tabPanel = new Tabpanel();
 		tabPanels.appendChild(tabPanel);
 		if (editable) {
-			editor = new CKeditor();
+			editor = new Cleditor();
 			tabPanel.appendChild(editor);
 			editor.setWidth("700px");
 			editor.setHeight("500px");
diff --git a/org.zkoss.zk.library/.classpath b/org.zkoss.zk.library/.classpath
index 5b9f4ddb2e..faa0fd93b6 100644
--- a/org.zkoss.zk.library/.classpath
+++ b/org.zkoss.zk.library/.classpath
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry exported="true" kind="lib" path="lib/jawwa-zk-cleditor-0.4.1.jar" sourcepath="lib/src/jawwa-zk-cleditor-0.4.1-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/calendar.jar" sourcepath="lib/src/calendar-source.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/asm.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/cglib.jar"/>
@@ -28,7 +29,6 @@
 	<classpathentry exported="true" kind="lib" path="lib/zweb.jar" sourcepath="lib/src/zweb-sources.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry exported="true" kind="lib" path="lib/ckez.jar" sourcepath="lib/src/ckez-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/zel.jar" sourcepath="lib/src/zel-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/zkbind.jar" sourcepath="lib/src/zkbind-sources.jar"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.zkoss.zk.library/META-INF/MANIFEST.MF b/org.zkoss.zk.library/META-INF/MANIFEST.MF
index 0c93cf1f0a..eb04af8a03 100644
--- a/org.zkoss.zk.library/META-INF/MANIFEST.MF
+++ b/org.zkoss.zk.library/META-INF/MANIFEST.MF
@@ -125,10 +125,10 @@ Bundle-ClassPath: .,
  lib/zkplus.jar,
  lib/zul.jar,
  lib/zweb.jar,
- lib/ckez.jar,
  lib/zel.jar,
  lib/zkbind.jar,
- lib/calendar.jar
+ lib/calendar.jar,
+ lib/jawwa-zk-cleditor-0.4.1.jar
 Export-Package: Lib,
  Lib.collections,
  Lib.compiler,
@@ -188,6 +188,7 @@ Export-Package: Lib,
  date,
  doc,
  drb,
+ fi.jawsy.jawwa.zk.cleditor,
  io,
  irb,
  irb.cmd,
@@ -517,7 +518,6 @@ Export-Package: Lib,
  org.python.tests.props,
  org.python.util,
  org.w3c.dom.html,
- org.zkforge.ckez,
  org.zkforge.json.simple,
  org.zkforge.json.simple.parser,
  org.zkforge.timeline,
@@ -693,153 +693,19 @@ Export-Package: Lib,
  uri,
  web,
  web.aud,
- web.ckez.html,
- web.ckez.img,
  web.dsp.action.html,
  web.html,
  web.img,
- web.js.ckez,
- web.js.ckez.ext.CKeditor,
- web.js.ckez.ext.CKeditor._source.adapters,
- web.js.ckez.ext.CKeditor._source.core,
- web.js.ckez.ext.CKeditor._source.core.dom,
- web.js.ckez.ext.CKeditor._source.core.htmlparser,
- web.js.ckez.ext.CKeditor._source.lang,
- web.js.ckez.ext.CKeditor._source.plugins.a11yhelp,
- web.js.ckez.ext.CKeditor._source.plugins.a11yhelp.dialogs,
- web.js.ckez.ext.CKeditor._source.plugins.a11yhelp.lang,
- web.js.ckez.ext.CKeditor._source.plugins.about,
- web.js.ckez.ext.CKeditor._source.plugins.about.dialogs,
- web.js.ckez.ext.CKeditor._source.plugins.adobeair,
- web.js.ckez.ext.CKeditor._source.plugins.ajax,
- web.js.ckez.ext.CKeditor._source.plugins.autogrow,
- web.js.ckez.ext.CKeditor._source.plugins.basicstyles,
- web.js.ckez.ext.CKeditor._source.plugins.bbcode,
- web.js.ckez.ext.CKeditor._source.plugins.bidi,
- web.js.ckez.ext.CKeditor._source.plugins.blockquote,
- web.js.ckez.ext.CKeditor._source.plugins.button,
- web.js.ckez.ext.CKeditor._source.plugins.clipboard,
- web.js.ckez.ext.CKeditor._source.plugins.clipboard.dialogs,
- web.js.ckez.ext.CKeditor._source.plugins.colorbutton,
- web.js.ckez.ext.CKeditor._source.plugins.colordialog,
- web.js.ckez.ext.CKeditor._source.plugins.colordialog.dialogs,
- web.js.ckez.ext.CKeditor._source.plugins.contextmenu,
- web.js.ckez.ext.CKeditor._source.plugins.devtools,
- web.js.ckez.ext.CKeditor._source.plugins.devtools.lang,
- web.js.ckez.ext.CKeditor._source.plugins.dialog,
- web.js.ckez.ext.CKeditor._source.plugins.dialogadvtab,
- web.js.ckez.ext.CKeditor._source.plugins.dialogui,
- web.js.ckez.ext.CKeditor._source.plugins.div,
- web.js.ckez.ext.CKeditor._source.plugins.div.dialogs,
- web.js.ckez.ext.CKeditor._source.plugins.docprops,
- web.js.ckez.ext.CKeditor._source.plugins.docprops.dialogs,
- web.js.ckez.ext.CKeditor._source.plugins.domiterator,
- web.js.ckez.ext.CKeditor._source.plugins.editingblock,
- web.js.ckez.ext.CKeditor._source.plugins.elementspath,
- web.js.ckez.ext.CKeditor._source.plugins.enterkey,
- web.js.ckez.ext.CKeditor._source.plugins.entities,
- web.js.ckez.ext.CKeditor._source.plugins.fakeobjects,
- web.js.ckez.ext.CKeditor._source.plugins.filebrowser,
- web.js.ckez.ext.CKeditor._source.plugins.find,
- web.js.ckez.ext.CKeditor._source.plugins.find.dialogs,
- web.js.ckez.ext.CKeditor._source.plugins.flash,
- web.js.ckez.ext.CKeditor._source.plugins.flash.dialogs,
- web.js.ckez.ext.CKeditor._source.plugins.flash.images,
- web.js.ckez.ext.CKeditor._source.plugins.floatpanel,
- web.js.ckez.ext.CKeditor._source.plugins.font,
- web.js.ckez.ext.CKeditor._source.plugins.format,
- web.js.ckez.ext.CKeditor._source.plugins.forms,
- web.js.ckez.ext.CKeditor._source.plugins.forms.dialogs,
- web.js.ckez.ext.CKeditor._source.plugins.forms.images,
- web.js.ckez.ext.CKeditor._source.plugins.horizontalrule,
- web.js.ckez.ext.CKeditor._source.plugins.htmldataprocessor,
- web.js.ckez.ext.CKeditor._source.plugins.htmlwriter,
- web.js.ckez.ext.CKeditor._source.plugins.iframe,
- web.js.ckez.ext.CKeditor._source.plugins.iframe.dialogs,
- web.js.ckez.ext.CKeditor._source.plugins.iframe.images,
- web.js.ckez.ext.CKeditor._source.plugins.iframedialog,
- web.js.ckez.ext.CKeditor._source.plugins.image,
- web.js.ckez.ext.CKeditor._source.plugins.image.dialogs,
- web.js.ckez.ext.CKeditor._source.plugins.indent,
- web.js.ckez.ext.CKeditor._source.plugins.justify,
- web.js.ckez.ext.CKeditor._source.plugins.keystrokes,
- web.js.ckez.ext.CKeditor._source.plugins.link,
- web.js.ckez.ext.CKeditor._source.plugins.link.dialogs,
- web.js.ckez.ext.CKeditor._source.plugins.link.images,
- web.js.ckez.ext.CKeditor._source.plugins.list,
- web.js.ckez.ext.CKeditor._source.plugins.listblock,
- web.js.ckez.ext.CKeditor._source.plugins.liststyle,
- web.js.ckez.ext.CKeditor._source.plugins.liststyle.dialogs,
- web.js.ckez.ext.CKeditor._source.plugins.maximize,
- web.js.ckez.ext.CKeditor._source.plugins.menu,
- web.js.ckez.ext.CKeditor._source.plugins.menubutton,
- web.js.ckez.ext.CKeditor._source.plugins.newpage,
- web.js.ckez.ext.CKeditor._source.plugins.pagebreak,
- web.js.ckez.ext.CKeditor._source.plugins.pagebreak.images,
- web.js.ckez.ext.CKeditor._source.plugins.panel,
- web.js.ckez.ext.CKeditor._source.plugins.panelbutton,
- web.js.ckez.ext.CKeditor._source.plugins.pastefromword,
- web.js.ckez.ext.CKeditor._source.plugins.pastefromword.filter,
- web.js.ckez.ext.CKeditor._source.plugins.pastetext,
- web.js.ckez.ext.CKeditor._source.plugins.pastetext.dialogs,
- web.js.ckez.ext.CKeditor._source.plugins.placeholder,
- web.js.ckez.ext.CKeditor._source.plugins.placeholder.dialogs,
- web.js.ckez.ext.CKeditor._source.plugins.placeholder.lang,
- web.js.ckez.ext.CKeditor._source.plugins.popup,
- web.js.ckez.ext.CKeditor._source.plugins.preview,
- web.js.ckez.ext.CKeditor._source.plugins.print,
- web.js.ckez.ext.CKeditor._source.plugins.removeformat,
- web.js.ckez.ext.CKeditor._source.plugins.resize,
- web.js.ckez.ext.CKeditor._source.plugins.richcombo,
- web.js.ckez.ext.CKeditor._source.plugins.save,
- web.js.ckez.ext.CKeditor._source.plugins.scayt,
- web.js.ckez.ext.CKeditor._source.plugins.scayt.dialogs,
- web.js.ckez.ext.CKeditor._source.plugins.selection,
- web.js.ckez.ext.CKeditor._source.plugins.showblocks,
- web.js.ckez.ext.CKeditor._source.plugins.showblocks.images,
- web.js.ckez.ext.CKeditor._source.plugins.showborders,
- web.js.ckez.ext.CKeditor._source.plugins.smiley,
- web.js.ckez.ext.CKeditor._source.plugins.smiley.dialogs,
- web.js.ckez.ext.CKeditor._source.plugins.smiley.images,
- web.js.ckez.ext.CKeditor._source.plugins.sourcearea,
- web.js.ckez.ext.CKeditor._source.plugins.specialchar,
- web.js.ckez.ext.CKeditor._source.plugins.specialchar.dialogs,
- web.js.ckez.ext.CKeditor._source.plugins.specialchar.lang,
- web.js.ckez.ext.CKeditor._source.plugins.styles,
- web.js.ckez.ext.CKeditor._source.plugins.styles.styles,
- web.js.ckez.ext.CKeditor._source.plugins.stylescombo,
- web.js.ckez.ext.CKeditor._source.plugins.stylesheetparser,
- web.js.ckez.ext.CKeditor._source.plugins.tab,
- web.js.ckez.ext.CKeditor._source.plugins.table,
- web.js.ckez.ext.CKeditor._source.plugins.table.dialogs,
- web.js.ckez.ext.CKeditor._source.plugins.tableresize,
- web.js.ckez.ext.CKeditor._source.plugins.tabletools,
- web.js.ckez.ext.CKeditor._source.plugins.tabletools.dialogs,
- web.js.ckez.ext.CKeditor._source.plugins.templates,
- web.js.ckez.ext.CKeditor._source.plugins.templates.dialogs,
- web.js.ckez.ext.CKeditor._source.plugins.templates.templates,
- web.js.ckez.ext.CKeditor._source.plugins.templates.templates.images,
- web.js.ckez.ext.CKeditor._source.plugins.toolbar,
- web.js.ckez.ext.CKeditor._source.plugins.uicolor,
- web.js.ckez.ext.CKeditor._source.plugins.uicolor.dialogs,
- web.js.ckez.ext.CKeditor._source.plugins.uicolor.lang,
- web.js.ckez.ext.CKeditor._source.plugins.uicolor.yui,
- web.js.ckez.ext.CKeditor._source.plugins.uicolor.yui.assets,
- web.js.ckez.ext.CKeditor._source.plugins.undo,
- web.js.ckez.ext.CKeditor._source.plugins.wsc,
- web.js.ckez.ext.CKeditor._source.plugins.wsc.dialogs,
- web.js.ckez.ext.CKeditor._source.plugins.wysiwygarea,
- web.js.ckez.ext.CKeditor._source.plugins.xml,
- web.js.ckez.ext.CKeditor._source.skins.kama,
- web.js.ckez.ext.CKeditor._source.skins.kama.images,
- web.js.ckez.ext.CKeditor._source.skins.office2003,
- web.js.ckez.ext.CKeditor._source.skins.office2003.images,
- web.js.ckez.ext.CKeditor._source.skins.v2,
- web.js.ckez.ext.CKeditor._source.skins.v2.images,
- web.js.ckez.ext.CKeditor._source.themes,
- web.js.ckez.ext.CKeditor.images,
+ web.jawwa.ext.cleditor,
+ web.jawwa.ext.cleditor.images,
+ web.js.calendar,
+ web.js.calendar.css,
+ web.js.calendar.img,
+ web.js.calendar.lang,
+ web.js.calendar.mold,
  web.js.gmaps,
  web.js.gmaps.ext,
+ web.js.jawwa.cleditor,
  web.js.timelinez,
  web.js.timelinez.css,
  web.js.timelinez.ext,
diff --git a/org.zkoss.zk.library/build.properties b/org.zkoss.zk.library/build.properties
index eea9f6787c..4111d37d60 100644
--- a/org.zkoss.zk.library/build.properties
+++ b/org.zkoss.zk.library/build.properties
@@ -25,8 +25,8 @@ bin.includes = META-INF/,\
                lib/zkplus.jar,\
                lib/zul.jar,\
                lib/zweb.jar,\
-               lib/ckez.jar,\
                lib/zel.jar,\
                lib/zkbind.jar,\
-               lib/calendar.jar
+               lib/calendar.jar,\
+               lib/jawwa-zk-cleditor-0.4.1.jar
 source.. = src/