diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 0fb533a8254..29b12b5f111 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -810,7 +810,8 @@ class MailComposeMessage(models.TransientModel):
             order = self.env['sale.order'].browse([self._context['default_res_id']])
             if order.state == 'draft':
                 order.state = 'sent'
-        return super(MailComposeMessage, self.with_context(mail_post_autofollow=True)).send_mail(auto_commit=auto_commit)
+            self = self.with_context(mail_post_autofollow=True)
+        return super(MailComposeMessage, self).send_mail(auto_commit=auto_commit)
 
 
 class AccountInvoice(models.Model):