@@ -249,15 +249,23 @@ this.App =

         App.debug ['message received', result]

         if (result.chat_id)

-          chat = App.Collections.chats.findById(result.chat_id)

-

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

+          chatId = result.chat_id

           tab = _.find(App.Views.tabbar.tabs, (tab) ->

-            tab.getChatId() == result.chat_id

+            tab.getChatId() == chatId

           )

-          tab.showChat()

+          if App.Views.tabbar and App.Views.tabbar.activeTab

+            if App.Views.tabbar.activeTab.model.get('chatId') != chatId

+              refreshScreen = true

+          else

+            refreshScreen = true

+

+          if refreshScreen

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

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

+            tab.showChat()

+

           contact = App.Collections.contacts.findByJid(App.stripJid(result.from))

           tab.chatWindow.appendMessage(contact, new Date(), result.message, result.id_message)

         else

@@ -278,7 +286,12 @@ this.App =

             contactView = App.Collections.contacts.friendsList.hasContact(contact)

           contact.setPreferredResource(result.from)

-          contactView.startChat()

+

+          if App.Views.tabbar and App.Views.tabbar.activeTab

+            if App.Views.tabbar.activeTab.model.get('withWhom') != contact

+              contactView.startChat()

+          else

+              contactView.startChat()

           tab = _.find(App.Views.tabbar.tabs, (tab) ->

             tab.hasParticipants(App.Models.me, contact)