From bff2fcde3cdb4adfdd501da9999ea5f6901edf76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= <ged@odoo.com>
Date: Wed, 9 Dec 2015 10:39:21 +0100
Subject: [PATCH] [FIX] mail: correctly handle message on star/unread updates

---
 addons/mail/static/src/js/chat_manager.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/addons/mail/static/src/js/chat_manager.js b/addons/mail/static/src/js/chat_manager.js
index 9c2787e18ce..852f1903429 100644
--- a/addons/mail/static/src/js/chat_manager.js
+++ b/addons/mail/static/src/js/chat_manager.js
@@ -450,6 +450,10 @@ function on_toggle_star_notification (data) {
             message.is_starred = data.starred;
             if (!message.is_starred) {
                 remove_message_from_channel("channel_starred", message);
+            } else {
+                add_to_cache(message, []);
+                var channel_starred = chat_manager.get_channel('channel_starred');
+                channel_starred.cache = _.pick(channel_starred.cache, "[]");
             }
             chat_manager.bus.trigger('update_message', message);
         }
@@ -487,8 +491,12 @@ function on_mark_as_unread_notification (data) {
         if (message) {
             invalidate_caches(message.channel_ids);
             add_channel_to_message(message, 'channel_inbox');
+            add_to_cache(message, []);
         }
     });
+    var channel_inbox = chat_manager.get_channel('channel_inbox');
+    channel_inbox.cache = _.pick(channel_inbox.cache, "[]");
+
     _.each(data.channel_ids, function (channel_id) {
         var channel = chat_manager.get_channel(channel_id);
         if (channel) {