diff --git a/addons/crm/crm_data.xml b/addons/crm/crm_data.xml
index e53d8e73599..3db7a457dfd 100644
--- a/addons/crm/crm_data.xml
+++ b/addons/crm/crm_data.xml
@@ -72,19 +72,4 @@
         </record>
     </data>
 
-    <!-- Mail template is done in a NOUPDATE block
-         so users can freely customize/delete them -->
-    <data noupdate="1">
-
-        <!--Definition of an email template with an empty body that will be used in opportunity mailing. Used to give a
-            basis for email recipients, name and to ease the definition of a further elaborated template. -->
-        <record id="email_template_opportunity_mail" model="email.template">
-            <field name="name">Opportunity - Send Emails</field>
-            <field name="subject">${object.name}</field>
-            <field name="model_id" ref="crm.model_crm_lead"/>
-            <field name="auto_delete" eval="True"/>
-            <field name="partner_to">${object.partner_id.id}</field>
-            <field name="body_html"></field> 
-        </record>
-    </data>
 </openerp>
diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/crm_lead_data.xml
index 724ec491efe..93290c9a1fa 100644
--- a/addons/crm/crm_lead_data.xml
+++ b/addons/crm/crm_lead_data.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
-    <data noupdate="1">
+    <!-- <data noupdate="1"> -->
+    <data>
 
         <!-- Crm stages -->
         <record model="crm.case.stage" id="stage_lead1">
@@ -221,5 +222,16 @@
             <field name="relation_field">section_id</field>
         </record>
 
+        <!--Definition of an email template with an empty body that will be used in opportunity mailing. Used to give a
+            basis for email recipients, name and to ease the definition of a further elaborated template. -->
+        <record id="lead_template" model="email.template">
+            <field name="name">Lead/Opportunity Mass Mail</field>
+            <field name="model_id" ref="crm.model_crm_lead"/>
+            <field name="auto_delete" eval="True"/>
+            <field name="partner_to">${object.partner_id and object.partner_id.id}</field>
+            <field name="email_to">${! object.partner_id and object.email}</field>
+            <field name="body_html"></field>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 3a8fcf8e0d6..1d659bd9cd7 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -582,7 +582,7 @@
         <!--
             MASS MAILING
         -->
-        <act_window name="Mass Mailing"
+        <act_window name="Lead/Opportunity Mass Mail"
                 res_model="mail.compose.message"
                 src_model="crm.lead"
                 view_mode="form"
@@ -593,7 +593,15 @@
                 context="{
                             'default_composition_mode': 'mass_mail',
                             'default_email_to':'{$object.email or \'\'}',
+                            'default_use_template': True,
+                            'default_template_id': ref('crm.lead_template'),
                         }"/>
 
+        <!--Definition of an email template with an empty body that will be used in opportunity mailing. Used to give a
+            basis for email recipients, name and to ease the definition of a further elaborated template. -->
+        <record id="lead_template" model="email.template">
+            <field name="ref_ir_act_window" ref="crm.action_lead_mass_mail"/>
+        </record>
+
     </data>
 </openerp>