@@ -29,8 +29,8 @@ this.App =

       windowHeight = $(window).height()

       toolboxHeight = $("#height-setter-1 .toolbox").height()

-      $(".friends").css({height: windowHeight - toolboxHeight - $('#js-me').height() - 40})

-      $("#height-setter-1").css({height: windowHeight - toolboxHeight - $('#js-active-friends').height() - 120})

+      $(".friends").css({height: windowHeight - toolboxHeight - $('#js-me').height() - 14})

+      $("#height-setter-1").css({height: windowHeight - toolboxHeight - $('#js-active-friends').height() - 119})

     resizeMessages: ->

       windowHeight = $(window).height()

@@ -259,7 +259,7 @@ this.App =

           tab.showChat()

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

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

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

         else

           #TODO: prepisat tuto hrozu

@@ -284,7 +284,7 @@ this.App =

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

           )

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

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

       )

   Models:

@@ -11,6 +11,7 @@ class Xmpp.Views.Chat.MessageView extends Backbone.View

     @dateSent = parts.date

     @fromMe = parts.fromMe

     @message = parts.message

+    @idMessage = parts.idMessage

   render: ->

     $(@el).html(@template(username: @user.get('name'), avatar: @user.get('avatar'), date: @formatTime(), message: @message))

@@ -86,8 +86,11 @@ class Xmpp.Views.Chat.WindowView extends Backbone.View

     App.debug ['append event', msg]

 #    @log(eventView) if logMe == true

-  appendMessage: (user, date, msg) ->

-    messageView = new Xmpp.Views.Chat.MessageView(user: user, date: date, message: msg, fromMe: user.get('jid') == App.Models.me.get('jid'))

+  appendMessage: (user, date, msg, idMessage) ->

+    if idMessage

+      return if @_checkIfMessageExists(idMessage)

+

+    messageView = new Xmpp.Views.Chat.MessageView(user: user, date: date, message: msg, fromMe: user.get('jid') == App.Models.me.get('jid'), idMessage: idMessage)

     $(@el).find('.messages').append(messageView.render().el)

     @log(messageView)

     Backbone.Events.trigger('resizeWorkspace')

@@ -123,8 +126,11 @@ class Xmpp.Views.Chat.WindowView extends Backbone.View

     $(@el).find(".action#{toEnable}, .current#{toEnable}").show()

     $(@el).find(".action#{toDisable}, .current#{toDisable}").hide()

-  prependHistoryMessage: (user, date, msg) ->

-    messageView = new Xmpp.Views.Chat.MessageView(user: user, date: date, message: msg, fromMe: user.get('jid') == App.Models.me.get('jid'))

+  prependHistoryMessage: (user, date, msg, msgId) ->

+    if msgId

+      return if @_checkIfMessageExists(msgId)

+

+    messageView = new Xmpp.Views.Chat.MessageView(user: user, date: date, message: msg, fromMe: user.get('jid') == App.Models.me.get('jid'), idMessage: msgId)

     $(@el).find('.messages').prepend(messageView.render().el)

     @log(messageView, true)

@@ -142,8 +148,13 @@ class Xmpp.Views.Chat.WindowView extends Backbone.View

         else

           contact = App.Collections.contacts.findByJid(jid) || Xmpp.Collections.ChatsCollection.createTempContact(jid)

-        @prependHistoryMessage(contact, new Date(message.created_at), message.message)

+        @prependHistoryMessage(contact, new Date(message.created_at), message.message, message.id)

       )

       @historyStep++ unless _.isEmpty(result.history)

     )

+

+  _checkIfMessageExists: (idMessage) ->

+    _.find(@historyStack, (message) ->

+      message.idMessage == idMessage

+    )

\ No newline at end of file

@@ -261,14 +261,17 @@ class WsChatController < WsController

         if can_save_conversation?(stripped_me, stripped_from, chat_id)

             Rails.logger.debug ['saving received message', stripped_me, chat_id]

-            save_encrypted_message(body, stripped_me, stripped_from, stripped_from, chat_id)

+            id_message = save_encrypted_message(body, stripped_me, stripped_from, stripped_from, chat_id)

+        else

+            id_message = nil

         end

         send_message 'app.chat.messageReceived',

                      from: from.to_s,

                      to: stripped_me,

                      message: body,

-                     chat_id: chat_id

+                     chat_id: chat_id,

+                     id_message: id_message

     end

     def send_contacts(to, me, chat_id)

@@ -23,6 +23,7 @@ class History

         history.messages << record

         history.save

+        record.id

     end

     def self.page_history(me, with, page, per_page)

@@ -36,7 +37,7 @@ class History

             {'$skip' => page * per_page},

             {'$limit' => per_page},

             {'$sort' => {'messages.created_at' => 1}},

-            {'$project' => {message: '$messages.message', from: '$messages.from', created_at: '$messages.created_at'}}

+            {'$project' => {message: '$messages.message', from: '$messages.from', created_at: '$messages.created_at', id: '$messages._id'}}

         ])

     end

 end