diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index 967fa5cbef5..7b1a6b3e441 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -412,8 +412,14 @@ class marketing_campaign_workitem(osv.osv):
             self.create(cr, uid, workitem_vals)
         return True
 
+    def button_draft(self, cr, uid, workitem_ids, context={}):
+        for wi in self.browse(cr, uid, workitem_ids, context=context):
+            if wi.state=='exception':
+                self.write(cr, uid, [wi.id], {'state':'todo'}, context=context)
+        return True
+
     def button_cancel(self, cr, uid, workitem_ids, context={}):
-        for wi in self.browse(cr, uid, workitem_ids):
+        for wi in self.browse(cr, uid, workitem_ids, context=context):
             if wi.state in ('todo','exception'):
                 self.write(cr, uid, [wi.id], {'state':'cancelled'}, context=context)
         return True
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index c606f7500e0..0ab2add38ba 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -404,8 +404,9 @@
                 <separator string="Status" colspan="4"/>
                 <group colspan="4" col="11">
                     <field name="state" nolabel="1" readonly="True" select="1"/>
+                    <button string="Retry" states="exception" name="button_draft" type="object" icon="gtk-ok"/>
                     <button string="Process" states="todo" name="process" type="object" icon="gtk-ok"/>
-                    <button string="Cancel" states="todo" name="button_cancel" type="object" icon="gtk-cancel"/>
+                    <button string="Cancel" states="todo,exception" name="button_cancel" type="object" icon="gtk-cancel"/>
                 </group>
             </form>
         </field>