diff --git a/addons/crm/views/crm_lead_views.xml b/addons/crm/views/crm_lead_views.xml
index 11a711372c3..a74433bdebb 100644
--- a/addons/crm/views/crm_lead_views.xml
+++ b/addons/crm/views/crm_lead_views.xml
@@ -600,34 +600,33 @@
             </field>
         </record>
 
+        <!--
+            MASS MAILING
+        -->
         <record id="crm_lead_act_window_compose" model="ir.actions.act_window">
             <field name="name">Send email</field>
             <field name="res_model">mail.compose.message</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
-            <field name="context">{
-                'default_composition_mode': 'comment',
-                'default_use_template': True,
-                'default_template_id': ref('crm.email_template_opportunity_mail'),
-                }</field>
+            <field name="context" eval="{
+    'default_composition_mode': 'comment',
+    'default_use_template': True,
+    'default_template_id': ref('crm.email_template_opportunity_mail'),
+                }"/>
             <field name="binding_model_id" ref="model_crm_lead"/>
-            <field name="binding_view_types">list</field>
+            <field name="binding_view_types">form</field>
         </record>
 
-        <!--
-            MASS MAILING
-        -->
-        <record id="crm.action_lead_mass_mail" model="ir.actions.act_window">
+        <record id="action_lead_mass_mail" model="ir.actions.act_window">
             <field name="name">Send email</field>
             <field name="res_model">mail.compose.message</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
-            <field name="context">{
-                            'default_composition_mode': 'mass_mail',
-                            'default_email_to':'{($object.email or \'\')|safe}',
-                            'default_use_template': True,
-                            'default_template_id': ref('crm.email_template_opportunity_mail'),
-                        }</field>
+            <field name="context" eval="{
+    'default_composition_mode': 'mass_mail',
+    'default_use_template': True,
+    'default_template_id': ref('crm.email_template_opportunity_mail'),
+                }"/>
             <field name="binding_model_id" ref="model_crm_lead"/>
             <field name="binding_view_types">list</field>
         </record>