diff --git a/app/Mail/TemplateEmail.php b/app/Mail/TemplateEmail.php
index a3a9a837fbe1..6c9a9217a0bc 100644
--- a/app/Mail/TemplateEmail.php
+++ b/app/Mail/TemplateEmail.php
@@ -49,8 +49,11 @@ class TemplateEmail extends Mailable
 
     public function build()
     {
-        // $template_name = 'email.template.'.$this->build_email->getTemplate();
-        $template_name = 'email.template.client';
+         $template_name = 'email.template.'.$this->build_email->getTemplate();
+
+        if ($this->build_email->getTemplate() == 'light' || $this->build_email->getTemplate() == 'dark') {
+            $template_name = 'email.template.client';
+        }
 
         if($this->build_email->getTemplate() == 'custom') {
             $this->build_email->setBody(str_replace('$body', $this->build_email->getBody(), $this->client->getSetting('email_style_custom')));
@@ -62,10 +65,6 @@ class TemplateEmail extends Mailable
             $this->build_email->setBody(
                 DesignHelpers::parseMarkdownToHtml($this->build_email->getBody())
             );
-
-//            $this->build_email->setBody(
-//                TemplateEngine::wrapElementsIntoTables('<div id="content-wrapper"></div>', $this->build_email->getBody(), $settings)
-//            );
         }
 
         $company = $this->client->company;