diff --git a/addons/im_livechat/views/im_livechat_channel_templates.xml b/addons/im_livechat/views/im_livechat_channel_templates.xml
index 7c2c3586d2e..5e46ae79d16 100644
--- a/addons/im_livechat/views/im_livechat_channel_templates.xml
+++ b/addons/im_livechat/views/im_livechat_channel_templates.xml
@@ -139,7 +139,7 @@
                 <script type="text/javascript" src="/mail/static/src/js/thread_windows/abstract_thread_window.js"></script>
                 <script type="text/javascript" src="/im_livechat/static/src/js/website_livechat_window.js"></script>
             <script type="text/javascript" src="/bus/static/src/js/bus.js"></script>
-            <script type="text/javascript" src="/mail/static/src/js/thread.js"></script>
+            <script type="text/javascript" src="/mail/static/src/js/thread_widget.js"></script>
             <script type="text/javascript" src="/mail/static/src/js/utils.js"></script>
             <script type="text/javascript" src="/mail/static/src/js/document_viewer.js"></script>
             <script type="text/javascript" src="/im_livechat/static/src/js/im_livechat.js"></script>
diff --git a/addons/mail/static/src/js/thread.js b/addons/mail/static/src/js/thread_widget.js
similarity index 100%
rename from addons/mail/static/src/js/thread.js
rename to addons/mail/static/src/js/thread_widget.js
diff --git a/addons/mail/views/mail_templates.xml b/addons/mail/views/mail_templates.xml
index 46c594ad40b..f5a3a840b55 100644
--- a/addons/mail/views/mail_templates.xml
+++ b/addons/mail/views/mail_templates.xml
@@ -47,8 +47,8 @@
                 <script type="text/javascript" src="/mail/static/src/js/form_renderer.js"></script>
                 <script type="text/javascript" src="/mail/static/src/js/basic_model.js"></script>
                 <script type="text/javascript" src="/mail/static/src/js/basic_view.js"></script>
-                <script type="text/javascript" src="/mail/static/src/js/thread.js"></script>
                 <script type="text/javascript" src="/mail/static/src/js/thread_field.js"></script>
+                <script type="text/javascript" src="/mail/static/src/js/thread_widget.js"></script>
                     <!-- systray -->
                     <script type="text/javascript" src="/mail/static/src/js/systray/systray_activity_menu.js"></script>
                     <script type="text/javascript" src="/mail/static/src/js/systray/systray_messaging_menu.js"></script>
diff --git a/addons/website_livechat/views/website_livechat.xml b/addons/website_livechat/views/website_livechat.xml
index 36dae3be74f..6914f75520b 100644
--- a/addons/website_livechat/views/website_livechat.xml
+++ b/addons/website_livechat/views/website_livechat.xml
@@ -13,7 +13,7 @@
                     <script type="text/javascript" src="/im_livechat/static/src/js/website_livechat_window.js"></script>
                 <script type="text/javascript" src="/bus/static/src/js/bus.js"></script>
                 <script type="text/javascript" src="/mail/static/src/js/document_viewer.js"></script>
-                <script type="text/javascript" src="/mail/static/src/js/thread.js"></script>
+                <script type="text/javascript" src="/mail/static/src/js/thread_widget.js"></script>
                 <script type="text/javascript" src="/mail/static/src/js/utils.js"></script>
                 <script type="text/javascript" src="/im_livechat/static/src/js/im_livechat.js"></script>
                 <!-- Models -->