@@ -132,7 +132,7 @@ class WsChatController < WsController

             stripped_to = Jabber::JID.new(message[:to]).strip!.to_s

             if can_save_conversation?(stripped_me, stripped_to, chat_id)

                 Rails.logger.debug ['saving sent message', stripped_me]

-                save_encrypted_message(message[:message], stripped_me, stripped_to, chat_id)

+                save_encrypted_message(message[:message], stripped_me, stripped_me, stripped_to, chat_id)

             end

             trigger_success message[:message]

@@ -261,7 +261,7 @@ 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, chat_id)

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

         end

         send_message 'app.chat.messageReceived',

@@ -304,11 +304,11 @@ class WsChatController < WsController

         end

     end

-    def save_encrypted_message(message, stripped_me, stripped_to, chat_id)

+    def save_encrypted_message(message, stripped_me, stripped_from, stripped_with, chat_id)

         credentials = User.crendentials_for_token(session[:token])

         found_account = credentials.detect do |c| c['jid'] == stripped_me end

         user_pass = Security::decrypt(found_account['pass'], connection_store[:cipher_key], connection_store[:cipher_iv])

         encrypted_msg = Security::encrypt(message, user_pass, Rails.application.config.aes_iv)

-        History.save_message(stripped_me, stripped_me, encrypted_msg, stripped_to, chat_id)

+        History.save_message(stripped_me, stripped_from, encrypted_msg, stripped_with, chat_id)

     end

 end

\ No newline at end of file