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

     'click .kick': 'kickFromMultiChat'

     'click .multichat': 'newMultiChat'

     'click .make-owner': 'switchOwner'

+    'click .remove': 'removeContact'

     click: 'startChat'

     mouseover: 'showIcons'

     mouseleave: 'hideIcons'

@@ -96,6 +97,12 @@ class Xmpp.Views.Contacts.ContactView extends Backbone.View

     App.Com.switchMultiChatOwner(App.Models.me.get('jid'), @model.get('jid'), multichat.get('chatId'))

+  removeContact: (e) ->

+    e.stopPropagation()

+    App.debug 'remove from roster'

+    App.Com.removeContactRemote(@model.get('jid'))

+    Backbone.Events.trigger('removeContact', @model)

+

   openChatById: (chatId) ->

     App.Collections.chats.findById(chatId)

@@ -122,16 +122,24 @@ class WsRosterController < WsController

         jid = message[:jid]

         client_jid = message[:client]

-        found_roster_item = nil

+        found_roster_items = []

         connection_store[:rosters].each do |roster|

             roster_item = roster.find(jid)

-            if roster_item.first[1] && connection_store[:link_roster_client][roster].jid.strip.to_s == client_jid

-                found_roster_item = roster_item.first[1]

-                break

+            contact_obj = roster_item.first[1]

+

+            if contact_obj

+                if client_jid && connection_store[:link_roster_client][roster].jid.strip.to_s == client_jid

+                    found_roster_items = [ contact_obj ]

+                    break

+                else

+                    found_roster_items.push(contact_obj)

+                end

             end

         end

-        found_roster_item && found_roster_item.remove()

+        found_roster_items.each do |contact|

+            contact.remove()

+        end

     end

     ##