diff --git a/app/DataMapper/EmailTemplateDefaults.php b/app/DataMapper/EmailTemplateDefaults.php
index eb831a516f87..e92fda3da951 100644
--- a/app/DataMapper/EmailTemplateDefaults.php
+++ b/app/DataMapper/EmailTemplateDefaults.php
@@ -121,7 +121,6 @@ class EmailTemplateDefaults
 
         return $converter->convertToHtml(self::transformText('invoice_message'));
 
-        //return Parsedown::instance()->line(self::transformText('invoice_message'));
     }
 
     public static function emailQuoteSubject()
diff --git a/app/Notifications/SendGenericNotification.php b/app/Notifications/SendGenericNotification.php
index 0ccbe6996e76..097047c023cb 100644
--- a/app/Notifications/SendGenericNotification.php
+++ b/app/Notifications/SendGenericNotification.php
@@ -77,11 +77,13 @@ class SendGenericNotification extends BaseNotification implements ShouldQueue
         $mail_message = (new MailMessage)
                         ->withSwiftMessage(function ($message) {
                             $message->getHeaders()->addTextHeader('Tag', $this->invitation->company->company_key);
-                        })->markdown($this->getTemplateView(), $this->buildMailMessageData());
+                        //})->markdown($this->getTemplateView(), $this->buildMailMessageData());
+                        })->markdown('email.template.plain', $this->buildMailMessageData());
 
         $mail_message = $this->buildMailMessageSettings($mail_message);
 
         return $mail_message;
+
     }
 
     /**
diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php
index 8acbce3f896c..3a5152d279f3 100644
--- a/app/Utils/HtmlEngine.php
+++ b/app/Utils/HtmlEngine.php
@@ -120,7 +120,7 @@ class HtmlEngine
             $data['$number']             = ['value' => $this->entity->number ?: ' ', 'label' => ctrans('texts.invoice_number')];
             $data['$entity.terms']       = ['value' => $this->entity->terms ?: ' ', 'label' => ctrans('texts.invoice_terms')];
             $data['$terms']              = &$data['$entity.terms'];
-            $data['$view_link']          = ['value' => '<a href="' .$invitation->getLink() .'">'. ctrans('texts.view_invoice').'</a>', 'label' => ctrans('texts.view_invoice')];
+            $data['$view_link']          = ['value' => '<a href="' .$this->invitation->getLink() .'">'. ctrans('texts.view_invoice').'</a>', 'label' => ctrans('texts.view_invoice')];
        }
 
         if ($this->entity_string == 'quote') {
@@ -128,7 +128,7 @@ class HtmlEngine
             $data['$number']             = ['value' => $this->entity->number ?: '&nbsp;', 'label' => ctrans('texts.quote_number')];
             $data['$entity.terms']       = ['value' => $this->entity->terms ?: '&nbsp;', 'label' => ctrans('texts.quote_terms')];
             $data['$terms']              = &$data['$entity.terms'];
-            $data['$view_link']          = ['value' => '<a href="' .$invitation->getLink() .'">'. ctrans('texts.view_quote').'</a>', 'label' => ctrans('texts.view_quote')];
+            $data['$view_link']          = ['value' => '<a href="' .$this->invitation->getLink() .'">'. ctrans('texts.view_quote').'</a>', 'label' => ctrans('texts.view_quote')];
        }
 
         if ($this->entity_string == 'credit') {
@@ -136,7 +136,7 @@ class HtmlEngine
             $data['$number']             = ['value' => $this->entity->number ?: '&nbsp;', 'label' => ctrans('texts.credit_number')];
             $data['$entity.terms']       = ['value' => $this->entity->terms ?: '&nbsp;', 'label' => ctrans('texts.credit_terms')];
             $data['$terms']              = &$data['$entity.terms'];
-            $data['$view_link']          = ['value' => '<a href="' .$invitation->getLink() .'">'. ctrans('texts.view_credit').'</a>', 'label' => ctrans('texts.view_credit')];
+            $data['$view_link']          = ['value' => '<a href="' .$this->invitation->getLink() .'">'. ctrans('texts.view_credit').'</a>', 'label' => ctrans('texts.view_credit')];
        }
 
         $data['$entity_number']          = &$data['$number'];
diff --git a/tests/MockAccountData.php b/tests/MockAccountData.php
index 18c02ecc300d..35096ddc2f2a 100644
--- a/tests/MockAccountData.php
+++ b/tests/MockAccountData.php
@@ -225,6 +225,7 @@ trait MockAccountData
         $this->quote = $this->quote_calc->getQuote();
         
         $this->quote->number = $this->getNextQuoteNumber($this->client);
+        $this->quote->service()->createInvitations()->markSent();
 
         $this->quote->setRelation('client', $this->client);
         $this->quote->setRelation('company', $this->company);
@@ -242,6 +243,7 @@ trait MockAccountData
 
         $this->credit->save();
         
+        $this->credit->service()->createInvitations()->markSent();
 
         $this->credit_calc = new InvoiceSum($this->credit);
         $this->credit_calc->build();