diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 9dda9d0b772..be1f6cbf91c 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -57,6 +57,7 @@ class account_invoice(models.Model):
         'state': {
             'account.mt_invoice_paid': lambda self, cr, uid, obj, ctx=None: obj.state == 'paid' and obj.type in ('out_invoice', 'out_refund'),
             'account.mt_invoice_validated': lambda self, cr, uid, obj, ctx=None: obj.state == 'open' and obj.type in ('out_invoice', 'out_refund'),
+            'account.mt_invoice_created': lambda self, cr, uid, obj, ctx=None: obj.state == 'draft' and obj.type in ('out_invoice', 'out_refund'),
         },
     }
 
@@ -314,6 +315,10 @@ class account_invoice(models.Model):
             'Invoice Number must be unique per Company!'),
     ]
 
+    @api.model
+    def create(self, vals):
+        return super(account_invoice, self.with_context(mail_create_nolog = True)).create(vals)
+
     @api.model
     def fields_view_get(self, view_id=None, view_type=False, toolbar=False, submenu=False):
         context = self._context
diff --git a/addons/account/data/account_data.xml b/addons/account/data/account_data.xml
index f284d540e65..7b7fde2e40c 100644
--- a/addons/account/data/account_data.xml
+++ b/addons/account/data/account_data.xml
@@ -155,5 +155,12 @@
             <field name="default" eval="False"/>
             <field name="description">Invoice paid</field>
         </record>
+        <record id="mt_invoice_created" model="mail.message.subtype">
+            <field name="name">Invoice Created</field>
+            <field name="res_model">account.invoice</field>
+            <field name="default" eval="False"/>
+            <field name="hidden" eval="True"/>
+            <field name="description">Invoice Created</field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/sale/sale_data.xml b/addons/sale/sale_data.xml
index a44bb1ba2d5..74f3f060bd7 100644
--- a/addons/sale/sale_data.xml
+++ b/addons/sale/sale_data.xml
@@ -59,6 +59,20 @@
             <field name="parent_id" eval="ref('sale.mt_order_confirmed')"/>
             <field name="relation_field">team_id</field>
         </record>
+        <record id="mt_salesteam_invoice_created" model="mail.message.subtype">
+            <field name="name">Invoice Created</field>
+            <field name="sequence">22</field>
+            <field name="res_model">crm.team</field>
+            <field name="parent_id" eval="ref('account.mt_invoice_created')"/>
+            <field name="relation_field">team_id</field>
+        </record>
+        <record id="mt_salesteam_invoice_confirmed" model="mail.message.subtype">
+            <field name="name">Invoice Confirmed</field>
+            <field name="sequence">23</field>
+            <field name="res_model">crm.team</field>
+            <field name="parent_id" eval="ref('account.mt_invoice_validated')"/>
+            <field name="relation_field">team_id</field>
+        </record>
 
     </data>
 </openerp>