diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
index 6273e054aab..1abbb65c72d 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
@@ -208,7 +208,7 @@ class crm_lead_forward_to_partner(osv.osv_memory):
         return {'type': 'ir.actions.act_window_close'}
 
     def get_lead_details(self, cr, uid, lead_id, context=None):
-        template = ["""Dear,
+        body = ["""Dear,
 
 Below is possibly an interesting lead for you.
 
@@ -250,7 +250,7 @@ Kind regards, OpenERP Team
                     body.append("%s: %s" % (field_definition.string, value or ''))
         elif lead.type == 'opportunity':
             pa = lead.partner_address_id
-            body = [
+            body += [
                 "Partner: %s" % (lead.partner_id and lead.partner_id.name_get()[0][1]),
                 "Contact: %s" % (pa.name or ''),
                 "Title: %s" % (pa.title or ''),
@@ -268,7 +268,7 @@ Kind regards, OpenERP Team
                 "Lead Category: %s" % (lead.categ_id and lead.categ_id.name or ''),
                 "Details: %s" % (lead.description or ''),
             ]
-        return "\n".join(template + body + ['---'])
+        return "\n".join(body + ['---'])
 
     def default_get(self, cr, uid, fields, context=None):
         """
@@ -297,14 +297,12 @@ Kind regards, OpenERP Team
             addr = partner_obj.address_get(cr, uid, [partner[0].id], ['contact'])
             email = self.pool.get('res.partner.address').browse(cr, uid, addr['contact']).email
 
-
-
         body = self._get_case_history(cr, uid, defaults.get('history', 'latest'), lead.id, context=context)
         defaults.update({
             'subject' : '%s: %s - %s' % (_('Fwd'), 'Openerp lead forward', lead.name),
             'body' : body,
             'email_cc' : email_cc,
-            'email_to' : email,
+            'email_to' : email or 'dummy@dummy.ly'
         })
         return defaults
 
@@ -321,9 +319,6 @@ class crm_lead_mass_forward_to_partner(osv.osv_memory):
         active_ids = context.get('active_ids')
         case_obj = self.pool.get('crm.lead')
         for case in case_obj.browse(cr, uid, active_ids, context=context):
-            if case.type != "opportunity":
-                continue
-
             if not case.partner_assigned_id:
                 case_obj.assign_partner(cr,uid, [case.id], context=context)
                 case = case_obj.browse(cr, uid, case.id, context=context)
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
index 3e28c56ee53..9826bf9d45c 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
@@ -92,16 +92,15 @@
             </field>
         </record>
 
+        <act_window id="action_crm_send_mass_forward"
+            multi="True"
+            key2="client_action_multi" name="Mass forward to partner"
+            res_model="crm.lead.mass.forward.to.partner" src_model="crm.lead"
+            view_mode="form" target="new" view_type="form"
+            context="{'mass_forward' : True}"
+            view_id="crm_forward_mass_mail_view"
+        />
 
-        <record model="ir.actions.act_window" id="action_crm_send_mass_forward">
-            <field name="name">Mass forward to partner</field>
-            <field name="res_model">crm.lead.mass.forward.to.partner</field>
-            <field name="src_model">crm.lead</field>
-            <field name="view_id" ref="crm_forward_mass_mail_view"/>
-            <field name="target">new</field>
-            <field name="key2">client_action_multi</field>
-            <field name="context">{'mass_forward' : True}</field>
-        </record>
 
 
     </data>