diff --git a/app/Utils/Traits/QuoteEmailBuilder.php b/app/Utils/Traits/QuoteEmailBuilder.php
index a01fee8566cb..2a77f9a435e8 100644
--- a/app/Utils/Traits/QuoteEmailBuilder.php
+++ b/app/Utils/Traits/QuoteEmailBuilder.php
@@ -56,8 +56,8 @@ trait QuoteEmailBuilder
             }
         }
 
-        $data['body'] = $this->parseTemplate($body_template, false, $contact);
-        $data['subject'] = $this->parseTemplate($subject_template, true, $contact);
+        $data['body'] = $this->parseTemplate($body_template, true, $contact);
+        $data['subject'] = $this->parseTemplate($subject_template, false, $contact);
 
         if ($client->getSetting('pdf_email_attachment') !== false) {
             $data['files'][] = $this->pdf_file_path();
@@ -78,8 +78,8 @@ trait QuoteEmailBuilder
             //$data = Parsedown::instance()->line($data);
 
             $converter = new CommonMarkConverter([
-                'html_input' => 'strip',
-                'allow_unsafe_links' => false,
+                 'html_input' => 'allow',
+                'allow_unsafe_links' => true,
             ]);
 
             $data = $converter->convertToHtml($data);