diff --git a/app/controllers/public/chat_controller.rb b/app/controllers/public/chat_controller.rb
index dff268c..7201c6e 100644
--- a/app/controllers/public/chat_controller.rb
+++ b/app/controllers/public/chat_controller.rb
@@ -55,8 +55,8 @@ class ChatController < PublicController
     messages_json = messages.map do |message|
       {
         :body => message.body,
-        :to => {:id => message.to.identifier, :name => message.to.name, :type => message.to.type},
-        :from => {:id => message.from.identifier, :name => message.from.name, :type => message.from.type},
+        :to => {:id => message.to.identifier, :name => message.to.name},
+        :from => {:id => message.from.identifier, :name => message.from.name},
         :created_at => message.created_at
       }
     end
diff --git a/public/javascripts/chat.js b/public/javascripts/chat.js
index f7c0a6b..3d93a3d 100644
--- a/public/javascripts/chat.js
+++ b/public/javascripts/chat.js
@@ -587,15 +587,9 @@ jQuery(function($) {
           var from = message['from'];
           var to = message['to'];
           var date = message['created_at'];
-          var group = to['type']=='Community' ? 'conference.' : '';
-          var domain = '127.0.0.1';
-
-          if(from['id']==getCurrentIdentifier()) {
-            Jabber.show_message(to['id']+'@'+group+domain, $own_name, body, 'self', from['id'], date);
-          } else {
-            var target = group!='' ? to['id'] : from['id']
-            Jabber.show_message(target+'@'+group+domain, from['name'], body, from['id'], from['id'], date);
-          }
+          var who = from['id']==getCurrentIdentifier() ? 'self' : from['id']
+
+	  Jabber.show_message(jid, from['name'], body, who, from['id'], date);
         });
       });
    }
--
libgit2 0.21.2