From bbf64347e42833248953229c7e67e6ec6f26dacc Mon Sep 17 00:00:00 2001
From: Aaron Bohy <aab@odoo.com>
Date: Thu, 28 Apr 2016 11:00:33 +0200
Subject: [PATCH] [FIX] mail: escape author name in messaging menu

---
 addons/mail/static/src/js/systray.js   | 4 +---
 addons/mail/static/src/xml/systray.xml | 1 +
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/mail/static/src/js/systray.js b/addons/mail/static/src/js/systray.js
index af442f5606e..5e73042a7aa 100644
--- a/addons/mail/static/src/js/systray.js
+++ b/addons/mail/static/src/js/systray.js
@@ -111,9 +111,7 @@ var MessagingMenu = Widget.extend({
 
             // Generate last message preview (inline message body and compute date to display)
             _.each(channels_preview, function (channel) {
-                channel.last_message_preview =
-                    channel.last_message.displayed_author + ': ' +
-                    chat_manager.get_message_body_preview(channel.last_message.body);
+                channel.last_message_preview = chat_manager.get_message_body_preview(channel.last_message.body);
                 if (channel.last_message.date.isSame(new Date(), 'd')) {  // today
                     channel.last_message_date = channel.last_message.date.format('LT');
                 } else {
diff --git a/addons/mail/static/src/xml/systray.xml b/addons/mail/static/src/xml/systray.xml
index 4a987fdf992..2ce26f4d485 100644
--- a/addons/mail/static/src/xml/systray.xml
+++ b/addons/mail/static/src/xml/systray.xml
@@ -45,6 +45,7 @@
                         <span class="o_last_message_date"> <t t-esc="channel.last_message_date"/> </span>
                     </div>
                     <div class="o_last_message_preview">
+                        <t t-esc="channel.last_message.displayed_author"/>:
                         <t t-raw="channel.last_message_preview"/>
                     </div>
                 </div>