Index: openacs-4/packages/chat/tcl/chat-ajax-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/tcl/chat-ajax-procs.tcl,v
diff -u -N -r1.30 -r1.31
--- openacs-4/packages/chat/tcl/chat-ajax-procs.tcl	6 Dec 2018 16:51:14 -0000	1.30
+++ openacs-4/packages/chat/tcl/chat-ajax-procs.tcl	6 Dec 2018 19:05:22 -0000	1.31
@@ -21,25 +21,31 @@
 
   chat_room instproc render {} {
       :get_parameters
-      return [::chat::Chat login \
+      set html [subst {
+        <div id='xowiki-chat-includelet'>
+            [::chat::Chat login \
                   -chat_id $chat_id \
                   -mode    $mode \
                   -path    $path]
+        </div>
+      }]
   }
 
 }
 
 namespace eval ::chat {
     ::xo::ChatClass Chat -superclass ::xowiki::Chat
 
-    Chat proc login {-chat_id {-package_id ""} {-mode ""} {-path ""} {-skin ""}} {
+    Chat proc login {-chat_id {-package_id ""} {-mode ""} {-path ""}} {
         if {![chat_room_exists_p $chat_id]} {
             return [_ chat.Room_not_found]
         } else {
             chat_room_get -room_id $chat_id -array c
+            set package_id $c(context_id)
+            set chat_skin [parameter::get -package_id $package_id -parameter ChatSkin]
             next -chat_id $chat_id \
-                -skin $skin \
-                -package_id $c(context_id) \
+                -skin $chat_skin \
+                -package_id $package_id \
                 -mode $mode \
                 -path $path \
                 -logout_messages_p $c(logout_messages_p) \
Index: openacs-4/packages/chat/www/chat.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/chat.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/chat/www/chat.adp	9 Nov 2018 16:48:36 -0000	1.2
+++ openacs-4/packages/chat/www/chat.adp	6 Dec 2018 19:05:22 -0000	1.3
@@ -3,8 +3,6 @@
 <property name="&doc">doc</property>
 <property name="focus">ichat_form.msg</property>
 
-<span id="my-user-id" hidden>@user_id@</span>
-
 <h1>@doc.title@</h1>
 <p>
     <a href="room-exit?room_id=@room_id@" class="button" title="#chat.exit_msg#">#chat.Log_off#</a> 
Index: openacs-4/packages/chat/www/chat.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/chat.tcl,v
diff -u -N -r1.23 -r1.24
--- openacs-4/packages/chat/www/chat.tcl	6 Dec 2018 16:51:14 -0000	1.23
+++ openacs-4/packages/chat/www/chat.tcl	6 Dec 2018 19:05:22 -0000	1.24
@@ -53,12 +53,8 @@
     ad_script_abort
 }
 
-set chat_skin [parameter::get -parameter ChatSkin]
+set chat_frame [::chat::Chat login -chat_id $room_id]
 
-set chat_frame [::chat::Chat login \
-                    -skin $chat_skin \
-                    -chat_id $room_id]
-
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4
Index: openacs-4/packages/xowiki/tcl/chat-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/chat-procs.tcl,v
diff -u -N -r1.51 -r1.52
--- openacs-4/packages/xowiki/tcl/chat-procs.tcl	6 Dec 2018 16:51:14 -0000	1.51
+++ openacs-4/packages/xowiki/tcl/chat-procs.tcl	6 Dec 2018 19:05:22 -0000	1.52
@@ -534,6 +534,7 @@
          </div>
          <div id='xowiki-chat-users'></div>
       </div>
+      <span id="xowiki-my-user-id" hidden>[ad_conn user_id]</span>
     }]
 
     set conf [dict create]
Index: openacs-4/packages/xowiki/tcl/includelet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/includelet-procs.tcl,v
diff -u -N -r1.236 -r1.237
--- openacs-4/packages/xowiki/tcl/includelet-procs.tcl	22 Nov 2018 09:08:33 -0000	1.236
+++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl	6 Dec 2018 19:05:22 -0000	1.237
@@ -4665,6 +4665,7 @@
           {-chat_id ""}
           {-mode ""}
           {-path ""}
+          -skin
           -login_messages_p
           -logout_messages_p
           -timewindow
@@ -4684,7 +4685,7 @@
     # We don't want to override Chat class default with our own and
     # therefore we build the command dynamically depending if these
     # variables are there or not.
-    set optional_vars [list login_messages_p logout_messages_p timewindow]
+    set optional_vars [list login_messages_p logout_messages_p timewindow skin]
     foreach var $optional_vars {
       if {[info exists $var]} {
         lappend chat_cmd -${var} [set $var]
Index: openacs-4/packages/xowiki/www/resources/chat-skins/chat-bubbles-common.js
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/chat-skins/chat-bubbles-common.js,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/xowiki/www/resources/chat-skins/chat-bubbles-common.js	6 Dec 2018 16:51:14 -0000	1.1
+++ openacs-4/packages/xowiki/www/resources/chat-skins/chat-bubbles-common.js	6 Dec 2018 19:05:22 -0000	1.2
@@ -82,7 +82,7 @@
     var user = msg.user.replace(/\\'/g, "\"");
     var message = createLink(msg.message);
     var user_id = msg.user_id;
-    var my_user = document.getElementById('my-user-id');
+    var my_user = document.getElementById('xowiki-my-user-id');
     if (my_user == null) {
         my_user_id = "";
     } else {
Index: openacs-4/packages/xowiki/www/resources/chat-skins/chat-bubbles.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/chat-skins/chat-bubbles.css,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/xowiki/www/resources/chat-skins/chat-bubbles.css	6 Dec 2018 16:51:14 -0000	1.1
+++ openacs-4/packages/xowiki/www/resources/chat-skins/chat-bubbles.css	6 Dec 2018 19:05:22 -0000	1.2
@@ -9,6 +9,13 @@
     position: relative;
 }
 
+/* Chat includelet */
+#xowiki-chat-includelet {
+    height: 700px;
+    width: 100%;
+    position: relative;
+}
+
 /* Users and messages container */
 #xowiki-chat {
     height: 100%;
Index: openacs-4/packages/xowiki/www/resources/chat-skins/chat-classic-common.js
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/chat-skins/chat-classic-common.js,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/xowiki/www/resources/chat-skins/chat-classic-common.js	6 Dec 2018 16:51:14 -0000	1.1
+++ openacs-4/packages/xowiki/www/resources/chat-skins/chat-classic-common.js	6 Dec 2018 19:05:22 -0000	1.2
@@ -82,7 +82,7 @@
     var user = msg.user.replace(/\\'/g, "\"");
     var message = createLink(msg.message);
     var user_id = msg.user_id;
-    var my_user = document.getElementById('my-user-id');
+    var my_user = document.getElementById('xowiki-my-user-id');
     if (my_user == null) {
         my_user_id = "";
     } else {
Index: openacs-4/packages/xowiki/www/resources/chat-skins/chat-classic.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/chat-skins/chat-classic.css,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/xowiki/www/resources/chat-skins/chat-classic.css	6 Dec 2018 16:51:14 -0000	1.1
+++ openacs-4/packages/xowiki/www/resources/chat-skins/chat-classic.css	6 Dec 2018 19:05:22 -0000	1.2
@@ -9,6 +9,13 @@
     position: relative;
 }
 
+/* Chat includelet */
+#xowiki-chat-includelet {
+    height: 700px;
+    width: 100%;
+    position: relative;
+}
+
 /* Users and messages container */
 #xowiki-chat {
     height: 100%;