diff --git a/addons/event/event.py b/addons/event/event.py
index 9aab9b8ee25..20697c1a86c 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -23,7 +23,7 @@ from datetime import timedelta
 import pytz
 
 from openerp import models, fields, api, _
-from openerp.exceptions import Warning
+from openerp.exceptions import AccessError, Warning
 
 class event_type(models.Model):
     """ Event Type """
@@ -384,6 +384,19 @@ class event_registration(models.Model):
         if template:
             mail_message = template.send_mail(self.id)
 
+    @api.multi
+    def message_get_suggested_recipients(self):
+        recipients = super(event_registration, self).message_get_suggested_recipients()
+        try:
+            for registration in self:
+                if registration.partner_id:
+                    self._message_add_suggested_recipient(recipients, registration, partner=registration.partner_id, reason=_('Registrant'))
+                elif registration.email:
+                    self._message_add_suggested_recipient(recipients, registration, email=registration.email, reason=_('Registrant Email'))
+        except AccessError: # no read access rights -> ignore suggested recipients
+            pass
+        return recipients
+
     @api.onchange('partner_id')
     def _onchange_partner(self):
         if self.partner_id:
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 201f5568cc4..3ee33e011b6 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -369,13 +369,7 @@
                                 <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}"/>
                                 <field name="name"/>
                                 <field name="phone"/>
-                                <label for="email"/>
-                                <div>
-                                    <field name="email" class="oe_inline"/>
-                                    <button class="oe_inline oe_right" string="Send Email"
-                                        name="%(mail.action_email_compose_message_wizard)d"
-                                        icon="terp-mail-message-new" context= '{"default_email_to":email}' type="action"/>
-                                </div>
+                                <field name="email"/>
                             </group>
                             <group>
                                 <field name="nb_register"/>