diff --git a/addons/l10n_it_edi/models/account_invoice.py b/addons/l10n_it_edi/models/account_invoice.py
index c78a295a008..a5fea8e86cb 100644
--- a/addons/l10n_it_edi/models/account_invoice.py
+++ b/addons/l10n_it_edi/models/account_invoice.py
@@ -273,11 +273,12 @@ class AccountInvoice(models.Model):
             'subject': _('Sending file: %s') % (self.l10n_it_einvoice_id.name),
             'body': _('Sending file: %s to ES: %s') % (self.l10n_it_einvoice_id.name, self.env.user.company_id.l10n_it_address_recipient_fatturapa),
             'email_from': self.env.user.company_id.l10n_it_address_send_fatturapa,
+            'reply_to': self.env.user.company_id.l10n_it_address_send_fatturapa,
             'mail_server_id': self.env.user.company_id.l10n_it_mail_pec_server_id.id,
             'attachment_ids': [(6, 0, self.l10n_it_einvoice_id.ids)],
         })
 
-        mail_fattura = self.env['mail.mail'].create({
+        mail_fattura = self.env['mail.mail'].with_context(wo_return_path=True).create({
             'mail_message_id': message.id,
             'email_to': self.env.user.company_id.l10n_it_address_recipient_fatturapa,
         })
diff --git a/addons/l10n_it_edi/models/ir_mail_server.py b/addons/l10n_it_edi/models/ir_mail_server.py
index 095dd293d8b..6e0b45d3bcf 100644
--- a/addons/l10n_it_edi/models/ir_mail_server.py
+++ b/addons/l10n_it_edi/models/ir_mail_server.py
@@ -356,3 +356,17 @@ class FetchmailServer(models.Model):
             if descrizione:
                 output_str += "<li>Errore %s: %s</li>" % (element[0].text, descrizione)
         return output_str + "</ul>"
+
+class IrMailServer(models.Model):
+    _name = "ir.mail_server"
+    _inherit = "ir.mail_server"
+
+    def build_email(self, email_from, email_to, subject, body, email_cc=None, email_bcc=None, reply_to=False,
+                attachments=None, message_id=None, references=None, object_id=False, subtype='plain', headers=None,
+                body_alternative=None, subtype_alternative='plain'):
+
+        if self.env.context.get('wo_return_path') and headers:
+            headers.pop('Return-Path', False)
+        return super(IrMailServer, self).build_email(email_from, email_to, subject, body, email_cc, email_bcc, reply_to,
+                attachments, message_id, references, object_id, subtype, headers,
+                body_alternative, subtype_alternative)