diff --git a/addons/event/models/event.py b/addons/event/models/event.py
index 6265c5f4610..b50dff53a59 100644
--- a/addons/event/models/event.py
+++ b/addons/event/models/event.py
@@ -277,6 +277,7 @@ class EventRegistration(models.Model):
     _description = 'Attendee'
     _inherit = ['mail.thread']
     _order = 'name, create_date desc'
+    _mail_mass_mailing = _('Event Attendees')
 
     origin = fields.Char(
         string='Source Document', readonly=True,
diff --git a/addons/event/models/event_mail.py b/addons/event/models/event_mail.py
index 6a5edd12854..a9a1a81db6b 100644
--- a/addons/event/models/event_mail.py
+++ b/addons/event/models/event_mail.py
@@ -33,7 +33,7 @@ class EventMailScheduler(models.Model):
         ('after_sub', 'After each registration'),
         ('before_event', 'Before the event'),
         ('after_event', 'After the event')],
-        string='When to Run ', default="before_event", required=True)
+        string='Trigger ', default="before_event", required=True)
     template_id = fields.Many2one(
         'mail.template', string='Email to Send',
         domain=[('model', '=', 'event.registration')], required=True, ondelete='restrict',
diff --git a/addons/event/views/event_views.xml b/addons/event/views/event_views.xml
index 70a9f8049e6..5bb9e12482b 100644
--- a/addons/event/views/event_views.xml
+++ b/addons/event/views/event_views.xml
@@ -423,28 +423,35 @@
             <field name="model">event.mail</field>
             <field name="arch" type="xml">
                 <form string="Event Mail Scheduler">
-                    <group>
-                        <field name="event_id"/>
-                        <field name="template_id"/>
-                        <field name="mail_sent"/>
-                    </group>
-                    <group>
-                        <field name="interval_nbr" attrs="{'readonly':[('interval_unit', '=', 'now')]}"/>
-                        <field name="interval_unit"/>
-                        <field name="interval_type"/>
-                        <field name="scheduled_date"/>
-                    </group>
-                    <notebook>
-                        <page string="Registration Mails">
-                            <field name="mail_registration_ids">
-                                <tree string="Registration mail" editable="bottom">
-                                    <field name="registration_id"/>
-                                    <field name="scheduled_date"/>
-                                    <field name="mail_sent"/>
-                                </tree>
-                            </field>
-                        </page>
-                    </notebook>
+                    <sheet>
+                        <group>
+                            <group>
+                                <field name="event_id"/>
+                                <field name="template_id"/>
+                                <field name="mail_sent"/>
+                            </group>
+                            <group>
+                                <label for="interval_nbr"/>
+                                <div class="o_row">
+                                    <field name="interval_nbr" attrs="{'invisible': [('interval_unit', '=', 'now')], 'readonly': [('interval_unit', '=', 'now')]}"/>
+                                    <field name="interval_unit"/>
+                                </div>
+                                <field name="interval_type"/>
+                                <field name="scheduled_date"/>
+                            </group>
+                        </group>
+                        <notebook>
+                            <page string="Registration Mails">
+                                <field name="mail_registration_ids">
+                                    <tree string="Registration mail" editable="bottom">
+                                        <field name="registration_id"/>
+                                        <field name="scheduled_date"/>
+                                        <field name="mail_sent"/>
+                                    </tree>
+                                </field>
+                            </page>
+                        </notebook>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/website_event_track/models/event_track.py b/addons/website_event_track/models/event_track.py
index c7acc2f00a8..7560077da61 100644
--- a/addons/website_event_track/models/event_track.py
+++ b/addons/website_event_track/models/event_track.py
@@ -32,6 +32,7 @@ class Track(models.Model):
     _description = 'Event Track'
     _order = 'priority, date'
     _inherit = ['mail.thread', 'website.seo.metadata', 'website.published.mixin']
+    _mail_mass_mailing = _('Track Speakers')
 
     name = fields.Char('Title', required=True, translate=True)
     active = fields.Boolean(default=True)