@@ -41,7 +41,12 @@ this.App =

     getMe: ->

       App.Com.trigger(event: 'app.roster.myself', success: (response) ->

-        App.Models.me = new Xmpp.Models.Me(jid: response.jid, name: response.vcard.name, status: response.status)

+        App.Models.me = new Xmpp.Models.Me(

+          jid: response.jid

+          name: response.vcard.name

+          status: response.status

+          avatar: response.vcard.avatar

+        )

       )

     _setupBackboneComponents: ->

@@ -6,6 +6,7 @@ class Xmpp.Models.Contact extends Xmpp.Models.Model

     name: ''

     status: 'offline'

     message: ''

+    avatar: ''

   initialize: ->

     _.bindAll(this)

@@ -33,4 +34,4 @@ class Xmpp.Collections.ContactsCollection extends Backbone.Collection

     @get(response.jid).set(message: response.status.message, status: response.status.status)

   udpateVcard: (response) ->

-    @get(response.jid).set(name: response.vcard.name)

\ No newline at end of file

+    @get(response.jid).set(name: response.vcard.name, avatar: response.vcard.avatar)

\ No newline at end of file

@@ -6,9 +6,10 @@ class Xmpp.Models.Me extends Xmpp.Models.Model

     name: ''

     status: 'online'

     message: ''

+    avatar: ''

   initialize: ->

     _.bindAll(this)

-    @view = new Xmpp.Views.Contacts.Me(model: this)

+    @view = new Xmpp.Views.Contacts.MeView(model: this)

     @view.render()

\ No newline at end of file

@@ -1,5 +1,5 @@

 .avatar

-  %img{src: 'assets/avatar.png', alt: I18n.t("chat.roster.avatar_alt") }

+  %img{src: "#{@avatar || 'assets/avatar.png'}", alt: I18n.t("chat.roster.avatar_alt") }

 %h1

   #{@name}

   %span.status.icon-record{class: "#{@status}"}

@@ -1,6 +1,6 @@

 .user

   .avatar.bigger{ title: "#{@jid}" }

-    %img{ src: 'assets/avatar.png', alt: I18n.t("chat.roster.avatar_alt") }

+    %img{ src: "#{@avatar || 'assets/avatar.png'}", alt: I18n.t("chat.roster.avatar_alt") }

   %h1{ title: "#{@jid}"} #{@name }

   %h2 #{@message || '<i>'+I18n.t('chat.roster.change_status_msg')+'</i>'}

   %h3

@@ -1,6 +1,6 @@

 Xmpp.Views.Contacts ||= {}

-class Xmpp.Views.Contacts.Me extends Backbone.View

+class Xmpp.Views.Contacts.MeView extends Backbone.View

   template: JST["backbone/templates/contacts/me"]

   el: $('#js-me')

@@ -15,6 +15,5 @@ class Xmpp.Views.Contacts.Me extends Backbone.View

   render: ->

     contact = @model.toJSON()

-    App.debug contact

     $(@el).html(@template(contact))

     this

\ No newline at end of file

@@ -62,13 +62,23 @@

   .avatar {

     float: left;

+

+    height: 32px;

+    width: 32px;

+

     margin-right: 8px;

     img {

       height: 32px;

+

+      margin: 0 auto;

+      display: block;

     }

     &.bigger {

+      height: 46px;

+      width: 46px;

+

       img {

         height: 46px;

       }

@@ -126,7 +126,11 @@ class WsRosterController < WebsocketRails::BaseController

             client.close()

         end

-        @storages.each do |storage|

+        @storages_arr.each do |storage|

+            connection_store.delete(storage)

+        end

+

+        @storages_hash.each do |storage|

             connection_store.delete(storage)

         end

     end

@@ -143,7 +147,7 @@ class WsRosterController < WebsocketRails::BaseController

         vcard = Jabber::Vcard::Helper.get(me, contact_jid)

         { name: pull_name_from_vcard(vcard) || contact_jid,

-          avatar: '' #TODO avatar

+          avatar: vcard["PHOTO/TYPE"] && ('data:' + vcard["PHOTO/TYPE"] + ';base64,' + vcard.photo_binval) || ''

         }

     end