diff --git a/addons/email_template/res_partner_view.xml b/addons/email_template/res_partner_view.xml
index 3d17120d69e..d3bab9d23e6 100644
--- a/addons/email_template/res_partner_view.xml
+++ b/addons/email_template/res_partner_view.xml
@@ -11,5 +11,35 @@
                 </xpath>
             </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="partner_template" model="email.template">
+            <field name="name">Partner Mass Mail</field>
+            <field name="model_id" ref="base.model_res_partner"/>
+            <field name="auto_delete" eval="True"/>
+            <field name="partner_to">${object.id}</field>
+        </record>
+
+        <!--  Replace the default mass-mailing wizard in base with the composition wizard -->
+        <act_window name="Partner Mass Mailing"
+                res_model="mail.compose.message"
+                src_model="res.partner"
+                view_mode="form"
+                multi="True"
+                target="new"
+                key2="client_action_multi"
+                id="base.action_partner_mass_mail"
+                context="{
+                            'default_composition_mode': 'mass_mail',
+                            'default_partner_to': '${object.id or \'\'}',
+                            'default_use_template': True,
+                            'default_template_id': ref('partner_template'),
+                        }"/>
+
+        <record id="partner_template" model="email.template">
+            <field name="ref_ir_act_window" ref="base.action_partner_mass_mail"/>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/email_template/wizard/mail_compose_message_view.xml b/addons/email_template/wizard/mail_compose_message_view.xml
index 8391924532b..f5ad47e20bc 100644
--- a/addons/email_template/wizard/mail_compose_message_view.xml
+++ b/addons/email_template/wizard/mail_compose_message_view.xml
@@ -8,9 +8,12 @@
             <field name="inherit_id" ref="mail.email_compose_message_wizard_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='subject']" position="after">
-                    <field name="partner_to" groups="base.group_no_one"/>
-                    <field name="email_to" groups="base.group_no_one"/>
-                    <field name="email_cc" groups="base.group_no_one"/>
+                    <field name="partner_to" groups="base.group_no_one"
+                        attrs="{'invisible':[('composition_mode', '!=', 'mass_mail')]}"/>/>
+                    <field name="email_to" groups="base.group_no_one"
+                        attrs="{'invisible':[('composition_mode', '!=', 'mass_mail')]}"/>/>
+                    <field name="email_cc" groups="base.group_no_one"
+                        attrs="{'invisible':[('composition_mode', '!=', 'mass_mail')]}"/>/>
                 </xpath>
                 <xpath expr="//footer" position="inside">
                     <group class="oe_right" col="1">
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 9a84e1b31fc..57daaf15a5e 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -127,6 +127,7 @@ class mail_compose_message(osv.TransientModel):
 
     _defaults = {
         'composition_mode': 'comment',
+        'email_from': lambda self, cr, uid, ctx={}: self.pool.get('mail.mail')._get_default_from(cr, uid, context=ctx),
         'body': lambda self, cr, uid, ctx={}: '',
         'subject': lambda self, cr, uid, ctx={}: False,
         'partner_ids': lambda self, cr, uid, ctx={}: [],
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index 2812287a860..01cecd7d52c 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -16,12 +16,14 @@
                         <field name="email_from"
                             attrs="{'invisible':[('composition_mode', '!=', 'mass_mail')]}"/>
                         <field name="subject" placeholder="Subject..." required="True"/>
-                        <field name="post"  groups="base.group_no_one"/>
+                        <field name="post"  groups="base.group_no_one"
+                            attrs="{'invisible':[('composition_mode', '!=', 'mass_mail')]}"/>
                         <field name="notify"  groups="base.group_no_one"
-                            attrs="{'invisible':[('post', '!=', True)]}"/>
-                        <field name="same_thread"/>
+                            attrs="{'invisible':['|', ('post', '!=', True), ('composition_mode', '!=', 'mass_mail')]}"/>
+                        <field name="same_thread"
+                            attrs="{'invisible':[('composition_mode', '!=', 'mass_mail')]}"/>
                         <field name="reply_to" placeholder="Email address te redirect replies..."
-                            attrs="{'invisible':[('same_thread', '=', True)],
+                            attrs="{'invisible':['|', ('same_thread', '=', True), ('composition_mode', '!=', 'mass_mail')],
                                     'required':[('same_thread', '!=', True)]}"/>
                         <label for="partner_ids" string="Recipients"
                             attrs="{'invisible':[('composition_mode', '=', 'mass_mail')]}"/>
@@ -58,7 +60,7 @@
         </record>
 
         <!--  Replace the default mass-mailing wizard in base with the composition wizard -->
-        <act_window name="Mass Mailing"
+        <act_window name="Partner Mass Mailing"
                 res_model="mail.compose.message"
                 src_model="res.partner"
                 view_mode="form"
@@ -70,5 +72,6 @@
                             'default_composition_mode': 'mass_mail',
                             'default_partner_to': '${object.id or \'\'}',
                         }"/>
+
     </data>
 </openerp>