diff --git a/addons/mail/static/src/js/systray/systray_activity_menu.js b/addons/mail/static/src/js/systray/systray_activity_menu.js
index 14a3ff7e513..8edad417456 100644
--- a/addons/mail/static/src/js/systray/systray_activity_menu.js
+++ b/addons/mail/static/src/js/systray/systray_activity_menu.js
@@ -111,13 +111,18 @@ var ActivityMenu = Widget.extend({
         if (actionXmlid) {
             this.do_action(actionXmlid);
         } else {
+            var domain = [['activity_ids.user_id', '=', session.uid]]
+            if (targetAction.data('domain')) {
+                domain = domain.concat(targetAction.data('domain'))
+            }
+            
             this.do_action({
                 type: 'ir.actions.act_window',
                 name: targetAction.data('model_name'),
                 views: [[false, 'activity'], [false, 'kanban'], [false, 'list']],
                 view_mode: 'activity',
                 res_model: targetAction.data('res_model'),
-                domain: [['activity_ids.user_id', '=', session.uid]],
+                domain: domain,
             });
         }
     },
@@ -140,13 +145,19 @@ var ActivityMenu = Widget.extend({
         // Necessary because activity_ids of mail.activity.mixin has auto_join
         // So, duplicates are faking the count and "Load more" doesn't show up
         context['force_search_count'] = 1;
+        
+        var domain = [['activity_ids.user_id', '=', session.uid]]
+        if (data.domain) {
+            domain = domain.concat(data.domain)
+        }
+        
         this.do_action({
             type: 'ir.actions.act_window',
             name: data.model_name,
             res_model:  data.res_model,
             views: [[false, 'kanban'], [false, 'list'], [false, 'form']],
             search_view_id: [false],
-            domain: [['activity_user_id', '=', session.uid]],
+            domain: domain,
             context:context,
         });
     },
diff --git a/addons/mail/static/src/xml/systray.xml b/addons/mail/static/src/xml/systray.xml
index dc275079e28..b10ef51a429 100644
--- a/addons/mail/static/src/xml/systray.xml
+++ b/addons/mail/static/src/xml/systray.xml
@@ -71,7 +71,7 @@
             </div>
         </t>
         <t t-foreach="activities" t-as="activity">
-            <div class="o_mail_preview o_systray_activity" t-att-data-res_model="activity.model" t-att-data-model_name="activity.name" data-filter='my'>
+            <div class="o_mail_preview o_systray_activity" t-att-data-res_model="activity.model" t-att-data-model_name="activity.name" t-att-data-domain="activity.domain" data-filter='my'>
                 <div t-if="activity.icon" class="o_mail_preview_image o_mail_preview_app">
                     <img t-att-src="activity.icon" alt="Activity"/>
                 </div>
@@ -87,7 +87,8 @@
                                     t-att-class="'o_mail_activity_action btn btn-link fa ' + action.icon"
                                     t-att-data-action_xmlid="action.action_xmlid"
                                     t-att-data-res_model="activity.model"
-                                    t-att-data-model_name="activity.name">
+                                    t-att-data-model_name="activity.name"
+                                    t-att-data-domain="activity.domain">
                                 </button>
                             </t>
                         </div>
diff --git a/addons/mass_mailing/models/__init__.py b/addons/mass_mailing/models/__init__.py
index 9797d43aeff..64b451ac37b 100644
--- a/addons/mass_mailing/models/__init__.py
+++ b/addons/mass_mailing/models/__init__.py
@@ -10,4 +10,5 @@ from . import mail_mail
 from . import mail_template
 from . import mail_thread
 from . import res_config_settings
+from . import res_users
 from . import utm
diff --git a/addons/mass_mailing/models/res_users.py b/addons/mass_mailing/models/res_users.py
new file mode 100644
index 00000000000..04b1cb74910
--- /dev/null
+++ b/addons/mass_mailing/models/res_users.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import api, models, _
+
+
+class Users(models.Model):
+    _name = 'res.users'
+    _inherit = ['res.users']
+
+    @api.model
+    def systray_get_activities(self):
+        """ Update systray name of mailing.mailing from "Mass Mailing"
+            to "Email Marketing".
+        """
+        activities = super(Users, self).systray_get_activities()
+        for activity in activities:
+            if activity.get('model') == 'mailing.mailing':
+                activity['name'] = _('Email Marketing')
+                break
+        return activities
diff --git a/addons/mass_mailing_sms/models/__init__.py b/addons/mass_mailing_sms/models/__init__.py
index 76457e3bdf4..1f0a7eb2c86 100644
--- a/addons/mass_mailing_sms/models/__init__.py
+++ b/addons/mass_mailing_sms/models/__init__.py
@@ -5,5 +5,6 @@ from . import mailing_contact
 from . import mailing_list
 from . import mailing_mailing
 from . import mailing_trace
+from . import res_users
 from . import sms_sms
 from . import utm
diff --git a/addons/mass_mailing_sms/models/res_users.py b/addons/mass_mailing_sms/models/res_users.py
new file mode 100644
index 00000000000..8c23887c537
--- /dev/null
+++ b/addons/mass_mailing_sms/models/res_users.py
@@ -0,0 +1,72 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import json
+
+from odoo import api, fields, models, modules, _
+
+
+class Users(models.Model):
+    _name = 'res.users'
+    _inherit = ['res.users']
+
+    @api.model
+    def systray_get_activities(self):
+        """ Split mass_mailing and mass_mailing_sms activities in systray by 
+            removing the single mailing.mailing activity represented and
+            doing a new query to split them by mailing_type.
+        """
+        activities = super(Users, self).systray_get_activities()
+        for activity in activities:
+            if activity.get('model') == 'mailing.mailing':
+                activities.remove(activity)
+                query = """SELECT m.mailing_type, count(*), act.res_model as model, act.res_id,
+                            CASE
+                                WHEN %(today)s::date - act.date_deadline::date = 0 Then 'today'
+                                WHEN %(today)s::date - act.date_deadline::date > 0 Then 'overdue'
+                                WHEN %(today)s::date - act.date_deadline::date < 0 Then 'planned'
+                            END AS states
+                        FROM mail_activity AS act
+                        JOIN mailing_mailing AS m ON act.res_id = m.id
+                        WHERE act.res_model = 'mailing.mailing' AND act.user_id = %(user_id)s  
+                        GROUP BY m.mailing_type, states, act.res_model, act.res_id;
+                        """
+                self.env.cr.execute(query, {
+                    'today': fields.Date.context_today(self),
+                    'user_id': self.env.uid,
+                })
+                activity_data = self.env.cr.dictfetchall()
+                
+                user_activities = {}
+                for act in activity_data:
+                    if not user_activities.get(act['mailing_type']):
+                        if act['mailing_type'] == 'sms':
+                            module = 'mass_mailing_sms'
+                            name = _('SMS Marketing')
+                        else:
+                            module = 'mass_mailing'
+                            name = _('Email Marketing')
+                        icon = module and modules.module.get_module_icon(module)
+                        res_ids = set()
+                        user_activities[act['mailing_type']] = {
+                            'name': name,
+                            'model': 'mailing.mailing',
+                            'type': 'activity',
+                            'icon': icon,
+                            'total_count': 0, 'today_count': 0, 'overdue_count': 0, 'planned_count': 0,
+                            'res_ids': res_ids,
+                        }
+                    user_activities[act['mailing_type']]['res_ids'].add(act['res_id'])
+                    user_activities[act['mailing_type']]['%s_count' % act['states']] += act['count']
+                    if act['states'] in ('today', 'overdue'):
+                        user_activities[act['mailing_type']]['total_count'] += act['count']
+
+                for mailing_type in user_activities.keys():
+                    user_activities[mailing_type].update({
+                        'actions': [{'icon': 'fa-clock-o', 'name': 'Summary',}],
+                        'domain': json.dumps([['activity_ids.res_id', 'in', list(user_activities[mailing_type]['res_ids'])]])
+                    })
+                activities.extend(list(user_activities.values()))
+                break
+
+        return activities