diff --git a/app/Mail/Engine/InvoiceEmailEngine.php b/app/Mail/Engine/InvoiceEmailEngine.php
index d6cc1c82453b..9ede43715dc8 100644
--- a/app/Mail/Engine/InvoiceEmailEngine.php
+++ b/app/Mail/Engine/InvoiceEmailEngine.php
@@ -132,7 +132,6 @@ class InvoiceEmailEngine extends BaseEmailEngine
             }
 
 
-
         }
 
         return $this;
diff --git a/app/Mail/TemplateEmail.php b/app/Mail/TemplateEmail.php
index 268424b4fb17..c14e6dcba23d 100644
--- a/app/Mail/TemplateEmail.php
+++ b/app/Mail/TemplateEmail.php
@@ -11,6 +11,8 @@
 
 namespace App\Mail;
 
+use App\Jobs\Invoice\CreateUbl;
+use App\Models\Account;
 use App\Models\Client;
 use App\Models\ClientContact;
 use App\Models\User;
@@ -116,6 +118,13 @@ class TemplateEmail extends Mailable
 
             }
 
+        if($this->invitation->invoice && $settings->ubl_email_attachment && $this->company->account->hasFeature(Account::FEATURE_DOCUMENTS)){
+
+            $ubl_string = CreateUbl::dispatchNow($this->invitation->invoice);
+            $this->attachData($ubl_string, $this->invitation->invoice->getFileName('xml'));
+            
+        }
+
         return $this;
     }
 }