diff --git a/app/Http/Controllers/PublicClientController.php b/app/Http/Controllers/PublicClientController.php
index f52e850e58..9d806061d8 100644
--- a/app/Http/Controllers/PublicClientController.php
+++ b/app/Http/Controllers/PublicClientController.php
@@ -174,7 +174,13 @@ class PublicClientController extends BaseController
         $invoice = $invitation->invoice;
         $pdfString = $invoice->getPDFString();
 
-        dd($pdfString);
+        header('Content-Type: application/pdf');
+        header('Content-Length: ' . strlen($pdfString));
+        header('Content-disposition: attachment; filename="' . $invoice->getFileName() . '"');
+        header('Cache-Control: public, must-revalidate, max-age=0');
+        header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+
+        return $pdfString;
     }
 
     public function dashboard()
diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php
index b8d31b97e7..4e15934efe 100644
--- a/app/Models/Invoice.php
+++ b/app/Models/Invoice.php
@@ -750,7 +750,7 @@ class Invoice extends EntityModel implements BalanceAffecting
             return false;
         }
 
-        return $pdfString;
+        return Utils::decodePDF($pdfString);
     }
 }
 
diff --git a/app/Ninja/Mailers/ContactMailer.php b/app/Ninja/Mailers/ContactMailer.php
index 6d588de343..dc513c3e88 100644
--- a/app/Ninja/Mailers/ContactMailer.php
+++ b/app/Ninja/Mailers/ContactMailer.php
@@ -56,7 +56,7 @@ class ContactMailer extends Mailer
         $sent = false;
 
         if ($account->attatchPDF() && !$pdfString) {
-            $pdfString = Utils::decodePDF($invoice->getPDFString());
+            $pdfString = $invoice->getPDFString();
         }
 
         foreach ($invoice->invitations as $invitation) {
@@ -184,7 +184,7 @@ class ContactMailer extends Mailer
         ];
 
         if ($account->attatchPDF()) {
-            $data['pdfString'] = Utils::decodePDF($invoice->getPDFString());
+            $data['pdfString'] = $invoice->getPDFString();
             $data['pdfFileName'] = $invoice->getFileName();
         }