diff --git a/addons/mail/static/src/js/models/channel.js b/addons/mail/static/src/js/models/threads/channel.js
similarity index 100%
rename from addons/mail/static/src/js/models/channel.js
rename to addons/mail/static/src/js/models/threads/channel.js
diff --git a/addons/mail/static/src/js/models/dm.js b/addons/mail/static/src/js/models/threads/dm.js
similarity index 100%
rename from addons/mail/static/src/js/models/dm.js
rename to addons/mail/static/src/js/models/threads/dm.js
diff --git a/addons/mail/static/src/js/models/document_thread.js b/addons/mail/static/src/js/models/threads/document_thread.js
similarity index 100%
rename from addons/mail/static/src/js/models/document_thread.js
rename to addons/mail/static/src/js/models/threads/document_thread.js
diff --git a/addons/mail/static/src/js/models/mailbox.js b/addons/mail/static/src/js/models/threads/mailbox.js
similarity index 100%
rename from addons/mail/static/src/js/models/mailbox.js
rename to addons/mail/static/src/js/models/threads/mailbox.js
diff --git a/addons/mail/static/src/js/models/thread.js b/addons/mail/static/src/js/models/threads/thread.js
similarity index 100%
rename from addons/mail/static/src/js/models/thread.js
rename to addons/mail/static/src/js/models/threads/thread.js
diff --git a/addons/mail/static/src/js/models/thread_with_cache.js b/addons/mail/static/src/js/models/threads/thread_with_cache.js
similarity index 100%
rename from addons/mail/static/src/js/models/thread_with_cache.js
rename to addons/mail/static/src/js/models/threads/thread_with_cache.js
diff --git a/addons/mail/views/mail_templates.xml b/addons/mail/views/mail_templates.xml
index bf98a07ee93..46c594ad40b 100644
--- a/addons/mail/views/mail_templates.xml
+++ b/addons/mail/views/mail_templates.xml
@@ -18,16 +18,17 @@
                 <script type="text/javascript" src="/mail/static/src/js/services/mail_window_manager.js"></script>
                 <script type="text/javascript" src="/mail/static/src/js/services/mail_service.js"></script>
                 <!-- Models -->
-                <script type="text/javascript" src="/mail/static/src/js/models/channel.js"></script>
-                <script type="text/javascript" src="/mail/static/src/js/models/dm.js"></script>
-                <script type="text/javascript" src="/mail/static/src/js/models/document_thread.js"></script>
                 <script type="text/javascript" src="/mail/static/src/js/models/mail_failure.js"></script>
-                <script type="text/javascript" src="/mail/static/src/js/models/mailbox.js"></script>
                     <!-- messages -->
                     <script type="text/javascript" src="/mail/static/src/js/models/messages/abstract_message.js"></script>
                     <script type="text/javascript" src="/mail/static/src/js/models/messages/message.js"></script>
-                <script type="text/javascript" src="/mail/static/src/js/models/thread.js"></script>
-                <script type="text/javascript" src="/mail/static/src/js/models/thread_with_cache.js"></script>
+                    <!-- threads -->
+                    <script type="text/javascript" src="/mail/static/src/js/models/threads/channel.js"></script>
+                    <script type="text/javascript" src="/mail/static/src/js/models/threads/dm.js"></script>
+                    <script type="text/javascript" src="/mail/static/src/js/models/threads/document_thread.js"></script>
+                    <script type="text/javascript" src="/mail/static/src/js/models/threads/mailbox.js"></script>
+                    <script type="text/javascript" src="/mail/static/src/js/models/threads/thread.js"></script>
+                    <script type="text/javascript" src="/mail/static/src/js/models/threads/thread_with_cache.js"></script>
                 <!-- Widgets -->
                     <!-- thread windows -->
                     <script type="text/javascript" src="/mail/static/src/js/thread_windows/abstract_thread_window.js"></script>