diff --git a/src/mibew/js/source/default/handlebars_helpers.js b/src/mibew/js/source/default/handlebars_helpers.js
index 063f0f26..1cae527e 100644
--- a/src/mibew/js/source/default/handlebars_helpers.js
+++ b/src/mibew/js/source/default/handlebars_helpers.js
@@ -17,6 +17,26 @@
  */
 
 (function(Mibew, Handlebars){
+    /**
+     * Registers "ifAgentSide" helper.
+     *
+     * This helper checks if this chat window opened by agent
+     * <code>
+     *   {{#ifAgentSide}}
+     *     Render some specific agent element
+     *   {{else}}
+     *     Render some specific client element
+     *   {{/ifEqual}}
+     * </code>
+     */
+    Handlebars.registerHelper('ifAgentSide', function(options) {
+        if (Mibew.Objects.Models.user.get('isAgent')) {
+            return options.fn(this);
+        } else {
+            return options.inverse(this);
+        }
+    });
+
     /**
      * Register 'formatTime' Handlebars helper.
      *
diff --git a/src/mibew/styles/chats/default/templates_src/client_side/chat/message.handlebars b/src/mibew/styles/chats/default/templates_src/client_side/chat/message.handlebars
index 8756d438..80bc338b 100644
--- a/src/mibew/styles/chats/default/templates_src/client_side/chat/message.handlebars
+++ b/src/mibew/styles/chats/default/templates_src/client_side/chat/message.handlebars
@@ -1,3 +1,9 @@
-<span>{{formatTime created}}</span> 
-{{#if name}}<span class='name-{{kindName}}'>{{name}}</span>: {{/if}}
+<span>{{formatTime created}}</span>
+{{#if name}}
+    {{#ifAgentSide}}
+        <span class='name-{{kindName}}'>{{name}}</span>:
+    {{else}}
+        <span class='name-{{kindName}}'>{{#ifEqual kindName "user"}}{{l10n "You"}}{{else}}{{name}}{{/ifEqual}}</span>:
+    {{/ifAgentSide}}
+{{/if}}
 <span class='message-{{kindName}}'>{{#replace "\n" "<br/>"}}{{urlReplace message}}{{/replace}}</span><br/>
\ No newline at end of file