diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/AChat.java b/org.adempiere.ui.swing/src/org/compiere/apps/AChat.java
index 584d0269ec..8c47f27636 100644
--- a/org.adempiere.ui.swing/src/org/compiere/apps/AChat.java
+++ b/org.adempiere.ui.swing/src/org/compiere/apps/AChat.java
@@ -80,9 +80,9 @@ public class AChat extends CDialog
 		}
 		//	Create Model
 		if (CM_Chat_ID > 0)
-			m_chat = new MChat (Env.getCtx(), AD_Table_ID, Record_ID, Description, trxName);
-		else
 			m_chat = new MChat (Env.getCtx(), CM_Chat_ID, trxName);
+		else
+			m_chat = new MChat (Env.getCtx(), AD_Table_ID, Record_ID, Description, trxName);
 		loadChat();
 		//
 		try
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WChat.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WChat.java
index b6be87e433..b16a25e198 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WChat.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WChat.java
@@ -99,14 +99,9 @@ public class WChat extends Window implements EventListener<Event>, DialogEvents
 		}
 		//	Create Model
 		if (CM_Chat_ID > 0)
+			m_chat = new MChat (Env.getCtx(), CM_Chat_ID, trxName);
+		else
 			m_chat = new MChat (Env.getCtx(), AD_Table_ID, Record_ID, Description, trxName);
-		else 
-		{
-			m_chat = new MChat (Env.getCtx(), 0, trxName);
-			m_chat.setDescription(Description);
-			m_chat.setAD_Table_ID(AD_Table_ID);
-			m_chat.setRecord_ID(Record_ID);
-		}
 		loadChat();
 		//
 	}	//	Attachment