diff --git a/addons/mass_mailing/__openerp__.py b/addons/mass_mailing/__openerp__.py
index db7ac54263a..92f8b1fc3e8 100644
--- a/addons/mass_mailing/__openerp__.py
+++ b/addons/mass_mailing/__openerp__.py
@@ -21,7 +21,11 @@
 
 {
     'name': 'Mass Mailing Campaigns',
-    'description': """TODO""",
+    'description': """
+Easily send mass mailing to your leads, opportunities or customers. Track
+marketing campaigns performance to improve conversion rates. Design
+professional emails and reuse templates in a few clicks.
+    """,
     'version': '1.0',
     'author': 'OpenERP',
     'website': 'http://www.openerp.com',
@@ -34,9 +38,9 @@
     ],
     'data': [
         'mail_data.xml',
-        'mass_mailing_view.xml',
         'wizard/mail_compose_message_view.xml',
         'wizard/mail_mass_mailing_create_segment.xml',
+        'mass_mailing_view.xml',
         'security/ir.model.access.csv',
     ],
     'js': [
diff --git a/addons/mass_mailing/mass_mailing_view.xml b/addons/mass_mailing/mass_mailing_view.xml
index f0c27f42a4a..c9594179a72 100644
--- a/addons/mass_mailing/mass_mailing_view.xml
+++ b/addons/mass_mailing/mass_mailing_view.xml
@@ -252,6 +252,9 @@
                                         <t t-if="widget.view.is_action_enabled('edit')">
                                             <li><a type="edit">Settings</a></li>
                                         </t>
+                                        <t t-if="widget.view.is_action_enabled('edit')">
+                                            <li><a name="%(action_mail_mass_mailing_create)d" type="action">New Wave</a></li>
+                                        </t>
                                         <t t-if="widget.view.is_action_enabled('delete')">
                                             <li><a type="delete">Delete</a></li>
                                         </t>
diff --git a/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.py b/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.py
index 9ea0d8aa1c5..4359d6c3e7b 100644
--- a/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.py
+++ b/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.py
@@ -36,7 +36,7 @@ class MailMassMailingCreate(osv.TransientModel):
             required=True,
         ),
         'model_id': fields.many2one(
-            'ir.model', 'Document',
+            'ir.model', 'Document Type',
             required=True,
             help='Document on which the mass mailing will run. This must be a '
                  'valid OpenERP model.',
@@ -116,6 +116,7 @@ class MailMassMailingCreate(osv.TransientModel):
             'default_template_id': wizard.template_id.id,
             'default_use_mass_mailing_campaign': True,
             'default_use_active_domain': True,
+            'default_model': wizard.model_id.model,
             'default_active_domain': wizard.domain,
             'default_mass_mailing_campaign_id': wizard.mass_mailing_campaign_id.id,
             'default_mass_mailing_id': wizard.mass_mailing_id.id,
diff --git a/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.xml b/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.xml
index e307bdd8909..ac313dea78b 100644
--- a/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.xml
+++ b/addons/mass_mailing/wizard/mail_mass_mailing_create_segment.xml
@@ -42,7 +42,7 @@
                             </p>
                         </div>
 
-                        <label for="model_id"/>
+                        <label for="template_id"/>
                         <div>
                             <field name="template_id"/>
                             <p class="oe_grey"
@@ -55,8 +55,7 @@
                         <label for="name"/>
                         <div>
                             <field name="name"/>
-                            <p class="oe_grey"
-                                attrs="{'invisible': [('name', '!=', False)]}">
+                            <p class="oe_grey">
                                 Please choose the name of the mailing.
                             </p>
                         </div>