@@ -15,7 +15,10 @@ class Xmpp.Collections.ChatsCollection extends Backbone.Collection

   initialize: ->

     _.bindAll(this)

-    @on("add", @newChat)

+    @on('add', @newChat)

+    Backbone.Events.on('closeChat', (tab, chat) =>

+      @removeChat(chat)

+    )

   newChat: (chat) ->

 #    App.debug ['adding chat to chatCollection', chat]

@@ -30,7 +30,16 @@ class Xmpp.Collections.ContactsCollection extends Backbone.Collection

     @activeList  = new Xmpp.Views.Contacts.ListView(collection: this, attributes: {title: 'chat.roster.chat-group', id: 'js-active-friends'})

     @activeList.setAsActiveChatGroup()

-    @on("add", @appendContact)

+    @on('add', @appendContact)

+

+    Backbone.Events.on('openChat', (chat) =>

+      @moveToInactiveList('all')

+      @moveToActiveList(chat.get('withWhom'))

+    )

+

+    Backbone.Events.on('closeChat', (tab, chat) =>

+      @moveToInactiveList(chat.get('withWhom'))

+    )

   appendContact: (contact) ->

     @friendsList.appendContact(contact)

@@ -28,7 +28,7 @@ class Xmpp.Views.Contacts.ContactView extends Backbone.View

   belongsToActiveList: ->

     @parentList.activeGroup == true

-  startChat: (event) ->

+  startChat: ->

     if @belongsToActiveList()

       return

@@ -39,14 +39,9 @@ class Xmpp.Views.Contacts.ContactView extends Backbone.View

     chat = App.Collections.chats.find(who, withWhom)

     if (! chat)

-#      App.debug ['not found in opened chats, creating new', chat]

+      App.debug ['not found in opened chats, creating new']

       chat = new Xmpp.Models.Chat(who: who, withWhom: withWhom)

       App.Collections.chats.add(chat)

-    App.Views.tabbar.addOrSelect(chat)

-    App.Collections.contacts.moveToInactiveList('all')

-    App.Collections.contacts.moveToActiveList(withWhom)

-#    @openChat(chat)

-

-  openChat: (chat) ->

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

@@ -27,9 +27,7 @@ class Xmpp.Views.Tabbar.TabView extends Backbone.View

     return this

   closeChat: ->

-    App.Views.tabbar.removeTab(this)

-    App.Collections.chats.removeChat(@model)

-    App.Collections.contacts.moveToInactiveList(@model.get('withWhom'))

+    Backbone.Events.trigger('closeChat', this, @model)

     @remove()

   hasParticipants: (who, withWhom) ->

@@ -7,6 +7,9 @@ class Xmpp.Views.Tabbar.TabbarView extends Backbone.View

   initialize: () ->

     _.bindAll(this)

+    Backbone.Events.on('openChat', @addOrSelect)

+                   .on('closeChat', @removeTab)

+

     @tabs = []

     @render()