@@ -71,11 +71,18 @@ this.App =

     openNewMultiChat: (chatOwner, attendant, chat) ->

       @trigger(event: 'app.chat.newMultiChat', data: {chatOwner: chatOwner.get('jid')}, success: (response) =>

         chat.setChatId(response.id)

+        chat.appendWithWhom(attendant)

         @trigger(event: 'app.chat.addToMultiChat', data: {chatOwner: chatOwner.get('jid'), chatId: response.id, jid: attendant.get('jid')}, success: ->

           Backbone.Events.trigger('openChat', chat)

         )

       )

+    inviteToChat: (chat, toAdd, me) ->

+      @trigger(event: 'app.chat.addToMultiChat', data: {chatOwner: me, chatId: chat.get('chatId'), jid: toAdd.get('jid')}, success: ->

+        chat.appendWithWhom(toAdd)

+        Backbone.Events.trigger('openChat', chat)

+      )

+

     iClosedMultichat: (chatId, jid) ->

       @trigger(event: 'app.chat.iClosedMultichat', data: {chatId: chatId, me: jid})

@@ -131,16 +138,19 @@ this.App =

       )

       App._dispatcher.bind('app.chat.importChat', (chatData) ->

-        newChat = new Xmpp.Models.Chat(

-          chatId: chatData.chat_id,

-          isMultiChat: true

-        );

+        chatId = chatData.chat_id

+        chat = App.Collections.chats.findById(chatId)

+

+        if not chat

+          chat = new Xmpp.Models.Chat(

+            chatId: chatId,

+            isMultiChat: true

+          )

-        App.debug newChat.get('chatId')

+          App.Collections.chats.add(chat);

-        App.Collections.chats.add(newChat);

-        newChat.syncContacts(chatData.contacts, chatData.owner);

-        Backbone.Events.trigger('openChat', newChat)

+        chat.syncContacts(chatData.contacts, chatData.owner)

+        Backbone.Events.trigger('openChat', chat)

       )

       App._dispatcher.bind('app.chat.messageReceived', (result) ->

@@ -60,18 +60,21 @@ class Xmpp.Views.Contacts.ContactView extends Backbone.View

   inviteToMultichat: (e) ->

     e.stopPropagation();

     App.debug 'iniviting to multichat'

+    multichat = App.Collections.chats.activeChat

+    if not multichat or not multichat.get('isMultiChat')

+      return

+

+    App.Com.inviteToChat(multichat, @model, App.Models.me.get('jid'))

   newMultiChat: (e) ->

     e.stopPropagation();

     App.debug 'new multichat'

-    withWhom = @model

     newChat = new Xmpp.Models.Chat(isMultiChat: true)

     newChat.set('who', App.Models.me)

-    newChat.appendWithWhom(withWhom)

     App.Collections.chats.add(newChat)

-    App.Com.openNewMultiChat(App.Models.me, withWhom, newChat)

+    App.Com.openNewMultiChat(App.Models.me, @model, newChat)

   kickFromMultiChat: (e) ->

     e.stopPropagation();

@@ -41,16 +41,12 @@ class WsChatController < WsController

         connection_store[:opened_chats] = {} if ! connection_store[:opened_chats]

         connection_store[:opened_chats][client] = {} if ! connection_store[:opened_chats][client]

-        connection_store[:opened_chats][client][chat_id] = {attendants: contacts, owner: message.from.node + '@' + message.from.domain}

+        connection_store[:opened_chats][client][chat_id] = {attendants: contacts, owner: message.from.strip.to_s}

-        #Rails.logger.debug [

-        #    owner: message.from.node + '@' + message.from.domain,

-        #    chat_id:  chat_id,

-        #    contacts: contacts

-        #]

+        #Rails.logger.debug [connection_store[:opened_chats][client], client.jid.to_s]

         send_message 'app.chat.importChat',

-                     owner:    message.from.node + '@' + message.from.domain,

+                     owner:    message.from.strip.to_s,

                      chat_id:  chat_id,

                      contacts: contacts

     end

@@ -74,12 +70,15 @@ class WsChatController < WsController

         client = find_client(message[:chatOwner])

         chat_id  = message[:chatId]

-        somebody = message[:jid]

+        add      = message[:jid]

-        connection_store[:opened_chats][client][chat_id][:attendants] << somebody

+        connection_store[:opened_chats][client][chat_id][:attendants] << add

         contacts = connection_store[:opened_chats][client][chat_id][:attendants]

-        client.send(MessageBuilder::export_multichat(client.jid.strip.to_s, somebody, chat_id, contacts))

+

+        contacts.each do |contact|

+            client.send(MessageBuilder::export_multichat(client.jid.strip.to_s, contact, chat_id, contacts))

+        end

         trigger_success

     end

@@ -95,13 +94,13 @@ class WsChatController < WsController

                 attendants -= [client.jid.strip.to_s]

                 messages = MessageBuilder::build_multi_messages(message[:message], client.jid.strip.to_s, attendants, chat_id)

+                #Rails.logger.debug messages

             else

                 messages = [MessageBuilder::build_message(message[:message], client.jid.strip.to_s, message[:to])]

             end

             # Xmpp4r doesn't support XEP-0033 (multicast messages)

             messages.each do |message|

-                #Rails.logger.debug message.to_s

                 client.send(message)

             end

@@ -162,7 +161,7 @@ class WsChatController < WsController

     private

     def process_incoming_message(message)

-        #Rails.logger.debug message

+        #Rails.logger.debug [message, message.to.strip.to_s]

         send_message 'app.chat.messageReceived',

                      from: message.from.strip.to_s,

                      to: message.to.strip.to_s,