diff --git a/app/Mail/TemplateEmail.php b/app/Mail/TemplateEmail.php
index 4c490c92e2..5aa12323bb 100644
--- a/app/Mail/TemplateEmail.php
+++ b/app/Mail/TemplateEmail.php
@@ -60,7 +60,7 @@ class TemplateEmail extends Mailable
         );
 
         $this->build_email->setBody(
-            TemplateEngine::wrapElementsIntoTables('<style></style><div id="content-wrapper"></div>', $this->build_email->getBody())
+            TemplateEngine::wrapElementsIntoTables('<div id="content-wrapper"></div>', $this->build_email->getBody())
         );
 
         $settings = $this->client->getMergedSettings();
diff --git a/app/Utils/TemplateEngine.php b/app/Utils/TemplateEngine.php
index e4add15e57..858d22046d 100644
--- a/app/Utils/TemplateEngine.php
+++ b/app/Utils/TemplateEngine.php
@@ -259,7 +259,13 @@ class TemplateEngine
         $documents['wrapper'] = new \DOMDocument();
         $documents['wrapper']->loadHTML($wrapper);
 
-        $styles = $documents['wrapper']->getElementsByTagName('style')->item(0)->nodeValue;
+        $documents['master'] = new \DOMDocument();
+
+        $documents['master']->loadHTML(
+          view('email.template.master', ['header' => '', 'slot' => ''])->render()
+        );
+
+        $styles = $documents['master']->getElementsByTagName('style')->item(0)->nodeValue;
 
         $documents['wrapper']->saveHTML();
 
diff --git a/resources/views/email/template/master.blade.php b/resources/views/email/template/master.blade.php
index 09fc5069f0..3bd5032170 100644
--- a/resources/views/email/template/master.blade.php
+++ b/resources/views/email/template/master.blade.php
@@ -117,6 +117,10 @@
         .button {
             padding: 12px; box-sizing: border-box;display: inline-block;font-family:arial,helvetica,sans-serif;text-decoration: none;-webkit-text-size-adjust: none;text-align: center;color: #FFFFFF; background-color: #142cb5; border-radius: 4px; -webkit-border-radius: 4px; -moz-border-radius: 4px; width:auto; max-width:100%; overflow-wrap: break-word; word-break: break-word; word-wrap:break-word; mso-border-alt: none;
         }
+
+        .center {
+            text-align: center;
+        }
     </style>
 </head>
 
@@ -199,7 +203,12 @@
                             <div style="width: 100% !important;">
                                 <!--[if (!mso)&(!IE)]><!--><div style="padding: 11px;border-top: 0px solid transparent;border-left: 0px solid transparent;border-right: 0px solid transparent;border-bottom: 0px solid transparent;"><!--<![endif]-->
                                     <div id="content-wrapper">
+                                        @yield('greeting')
+
                                         {{ $slot }}
+
+                                        @yield('signature')
+                                        @yield('footer')
                                     </div>
 
                                     <!-- Before border -->