diff --git a/app/Mail/Engine/InvoiceEmailEngine.php b/app/Mail/Engine/InvoiceEmailEngine.php
index 26f3abc26b97..f19d156ebc01 100644
--- a/app/Mail/Engine/InvoiceEmailEngine.php
+++ b/app/Mail/Engine/InvoiceEmailEngine.php
@@ -130,7 +130,7 @@ class InvoiceEmailEngine extends BaseEmailEngine
             
             $pdf = ((new CreateRawPdf($this->invitation, $this->invitation->company->db))->handle());
 
-            $this->setAttachments([['file' => base64_encode($pdf), 'name' => ctrans('texts.invoice') . " " .$this->invoice->numberFormatter().'.pdf']]);   
+            $this->setAttachments([['file' => base64_encode($pdf), 'name' => $this->invoice->numberFormatter().'.pdf']]);   
         }
 
         //attach third party documents
diff --git a/app/Mail/TemplateEmail.php b/app/Mail/TemplateEmail.php
index 8f4299c939dd..d06620546e95 100644
--- a/app/Mail/TemplateEmail.php
+++ b/app/Mail/TemplateEmail.php
@@ -118,7 +118,10 @@ class TemplateEmail extends Mailable
                 'logo' => $this->company->present()->logo($settings),
             ]);
 
-        foreach ($this->build_email->getAttachments() as $file) {
+        nlog($this->build_email->getAttachments());
+
+
+        foreach (array_reverse($this->build_email->getAttachments()) as $file) {
             if(array_key_exists('file', $file))
                 $this->attachData(base64_decode($file['file']), $file['name']);
             else