diff --git a/openerp/addons/base/res/partner/wizard/partner_wizard_spam.py b/openerp/addons/base/res/partner/wizard/partner_wizard_spam.py
index 2db92e8c4b5..c14101135c4 100644
--- a/openerp/addons/base/res/partner/wizard/partner_wizard_spam.py
+++ b/openerp/addons/base/res/partner/wizard/partner_wizard_spam.py
@@ -19,15 +19,16 @@
 #
 ##############################################################################
 
-import netsvc
-import tools
 from osv import fields, osv
 import re
+import logging
 
-class partner_wizard_spam(osv.osv_memory):
+_logger = logging.getLogger('mass.mailing')
+
+class partner_massmail_wizard(osv.osv_memory):
     """ Mass Mailing """
 
-    _name = "partner.wizard.spam"
+    _name = "partner.massmail.wizard"
     _description = "Mass Mailing"
 
     _columns = {
@@ -37,42 +38,45 @@ class partner_wizard_spam(osv.osv_memory):
     }
 
     def mass_mail_send(self, cr, uid, ids, context):
-        """
-            Send Email
+        """Send the given mail to all partners whose ids
+           are present in ``context['active_ids']``, to
+           all addresses with an email set.
 
-            @param cr: the current row, from the database cursor.
-            @param uid: the current user’s ID for security checks.
-            @param ids: the ID or list of IDs
-            @param context: A standard dictionary
+           :param dict context: ``context['active_ids']``
+                                should contain the list of
+                                ids of the partners who should
+                                receive the mail.
         """
-
         nbr = 0
         partner_pool = self.pool.get('res.partner')
         data = self.browse(cr, uid, ids[0], context=context)
         event_pool = self.pool.get('res.partner.event')
-        active_ids = context and context.get('active_ids', [])
+        assert context['active_model'] == 'res.partner', 'This wizard must be started on a list of Partners'
+        active_ids = context.get('active_ids', [])
         partners = partner_pool.browse(cr, uid, active_ids, context)
-        type_ = 'plain'
+        subtype = 'plain'
         if re.search('(<(pre)|[pubi].*>)', data.text):
-            type_ = 'html'
+            subtype = 'html'
+        ir_mail_server = self.pool.get('ir.mail_server')
+        emails_seen = set()
         for partner in partners:
             for adr in partner.address:
-                if adr.email:
-                    name = adr.name or partner.name
-                    to = '"%s" <%s>' % (name, adr.email)
-    #TODO: add some tests to check for invalid email addresses
-    #CHECKME: maybe we should use res.partner/email_send
-                    smtp_server_pool = self.pool.get('ir.mail_server')
-                    msg = smtp_server_pool.pack_message(cr, uid, data.email_from, [to], data.subject, data.text, subtype=type_)
-                    smtp_server_pool.send_email(cr, uid, msg)
-                    nbr += 1
+                if adr.email and not adr.email in emails_seen:
+                    try:
+                        emails_seen.add(adr.email)
+                        name = adr.name or partner.name
+                        to = '"%s" <%s>' % (name, adr.email)
+                        msg = ir_mail_server.build_email(data.email_from, [to], data.subject, data.text, subtype=subtype)
+                        if ir_mail_server.send_email(cr, uid, msg):
+                            nbr += 1
+                    except Exception:
+                        #ignore failed deliveries, will be logged anyway
+                        pass
             event_pool.create(cr, uid,
                     {'name': 'Email(s) sent through mass mailing',
                      'partner_id': partner.id,
                      'description': data.text })
-    #TODO: log number of message sent
+        _logger.info('Mass-mailing wizard sent %s emails', nbr)
         return {'email_sent': nbr}
 
-partner_wizard_spam()
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/addons/base/res/partner/wizard/partner_wizard_spam_view.xml b/openerp/addons/base/res/partner/wizard/partner_wizard_spam_view.xml
index 0de26400f90..864550b4396 100644
--- a/openerp/addons/base/res/partner/wizard/partner_wizard_spam_view.xml
+++ b/openerp/addons/base/res/partner/wizard/partner_wizard_spam_view.xml
@@ -4,7 +4,7 @@
 
         <record id="view_partner_mass_mail" model="ir.ui.view">
             <field name="name">Mass Mailing</field>
-            <field name="model">partner.wizard.spam</field>
+            <field name="model">partner.massmail.wizard</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
               <form string="Mass Mailing" col="4">
@@ -24,7 +24,7 @@
         </record>
 
        <act_window name="Mass Mailing"
-            res_model="partner.wizard.spam"
+            res_model="partner.massmail.wizard"
             src_model="res.partner"
             view_mode="form"
             target="new"