diff --git a/addons/mail/static/src/js/filter_menu.js b/addons/mail/static/src/js/filter_menu.js
new file mode 100644
index 00000000000..dbf2428bda9
--- /dev/null
+++ b/addons/mail/static/src/js/filter_menu.js
@@ -0,0 +1,16 @@
+odoo.define('mail.FilterMenu', function (require) {
+"use strict";
+
+var FilterMenu = require('web.FilterMenu');
+
+FilterMenu.include({
+    init: function () {
+        this._super.apply(this, arguments);
+        //remove messages from custom filters
+        this.fields = _.pick(this.fields, function (field, name) {
+            return field.relation !== 'mail.message' && name !== 'message_ids';
+        });
+    },
+});
+
+});
diff --git a/addons/mail/views/mail_templates.xml b/addons/mail/views/mail_templates.xml
index 15cd3f50e60..5bfd9884670 100644
--- a/addons/mail/views/mail_templates.xml
+++ b/addons/mail/views/mail_templates.xml
@@ -69,6 +69,8 @@
                 <script type="text/javascript" src="/mail/static/src/js/user_menu.js"></script>
                 <!-- tools -->
                 <script type="text/javascript" src="/mail/static/src/js/tools/debug_manager.js"></script>
+                <!-- filter menu -->
+                <script type="text/javascript" src="/mail/static/src/js/filter_menu.js"></script>
                 <!-- utils -->
                 <script type="text/javascript" src="/mail/static/src/js/utils.js"></script>
                 <script type="text/javascript" src="/mail/static/src/js/activity.js"></script>