diff --git a/Lombiq.HelpfulExtensions/Views/Layout-EmailTemplate.cshtml b/Lombiq.HelpfulExtensions/Views/Layout-EmailTemplate.cshtml
index 1658df3..6ca0c08 100644
--- a/Lombiq.HelpfulExtensions/Views/Layout-EmailTemplate.cshtml
+++ b/Lombiq.HelpfulExtensions/Views/Layout-EmailTemplate.cshtml
@@ -1,7 +1,6 @@
 @{
     const string blockName = "emailTemplate";
 }
-
 <!DOCTYPE html>
 <html lang="@Orchard.CultureName()">
 <head>
@@ -13,32 +12,41 @@
     <title>
         <shape type="EmailTemplate_Title"></shape>
     </title>
-
+    <style>
+        .preHeader {
+            display: none;
+            max-height: 0;
+            overflow: hidden;
+        }
+    </style>
     @await RenderSectionAsync("Head", required: false)
-
     <shape type="EmailTemplate_LayoutInjections" prop-layoutModel="@Model"></shape>
 </head>
 <body>
-
-    <span class="preheader" style="display: none; max-height: 0px; overflow: hidden;"> @* #spell-check-ignore-line *@
-        @await RenderSectionAsync("Preheader", required: false) @* #spell-check-ignore-line *@
+    @if (Model.PreHeader != null)
+    {
+    <span class="preHeader">
+        @await RenderSectionAsync("PreHeader", required: false)
     </span>
-
+    }
     <div class="@(blockName)">
+        @if (Model.Header != null)
+        {
         <div class="@(blockName)__header">
             @await RenderSectionAsync("Header", required: false)
         </div>
-
+        }
         <div class="@(blockName)__content">
             @await RenderSectionAsync("BeforeContent", required: false)
             @await RenderBodyAsync()
             @await RenderSectionAsync("AfterContent", required: false)
         </div>
-
+        @if(Model.Footer != null)
+        {
         <div class="@(blockName)__footer">
             @await RenderSectionAsync("Footer", required: false)
         </div>
+        }
     </div>
-
 </body>
 </html>
