diff --git a/include/i18n/en_US/templates/page/access-link.yaml b/include/i18n/en_US/templates/page/access-link.yaml
index 977e11b72bc6da1a9c38c319cc0619171d06d805..9f7cd1f99a61dbc5134919c29366b4ac98bedf5b 100644
--- a/include/i18n/en_US/templates/page/access-link.yaml
+++ b/include/i18n/en_US/templates/page/access-link.yaml
@@ -12,6 +12,7 @@ notes: >
 name: "Ticket [#%{ticket.number}] Access Link"
 body: >
     <h3><strong>Hi %{recipient.name.first},</strong></h3>
+    <div>
     An access link request for ticket #%{ticket.number} has been submitted
     on your behalf for the helpdesk at %{url}.<br />
     <br />
@@ -27,3 +28,4 @@ body: >
     <br />
     --<br />
     %{company.name}
+    </div>
diff --git a/include/i18n/en_US/templates/page/pwreset-client.yaml b/include/i18n/en_US/templates/page/pwreset-client.yaml
index ad839de8e825a98c7602dd982f7ba84788fad465..36025c8b722e4bdf1cee8e600d2c3643da39e6c1 100644
--- a/include/i18n/en_US/templates/page/pwreset-client.yaml
+++ b/include/i18n/en_US/templates/page/pwreset-client.yaml
@@ -5,11 +5,12 @@
 # link on the login page
 ---
 notes: >
-    This template defines the email sent to Clients who select the <strong>Forgot My 
+    This template defines the email sent to Clients who select the <strong>Forgot My
     Password</strong> link on the Client Log In page.
 name: "%{company.name} Help Desk Access"
 body: >
     <h3><strong>Hi %{user.name.first},</strong></h3>
+    <div>
     A password reset request has been submitted on your behalf for the
     helpdesk at %{url}.<br />
     <br />
@@ -26,3 +27,4 @@ body: >
     <em style="font-size: small">Your friendly Customer Support System
     <br />
     %{company.name}</em>
+    </div>
diff --git a/include/i18n/en_US/templates/page/pwreset-staff.yaml b/include/i18n/en_US/templates/page/pwreset-staff.yaml
index 1b39661fd17b574e9721973d4680cacff19e6e66..bba06e8782193276bb80727674a5cb2340eddf91 100644
--- a/include/i18n/en_US/templates/page/pwreset-staff.yaml
+++ b/include/i18n/en_US/templates/page/pwreset-staff.yaml
@@ -10,6 +10,7 @@ notes: >
 name: "osTicket Staff Password Reset"
 body: >
     <h3><strong>Hi %{staff.name.first},</strong></h3>
+    <div>
     A password reset request has been submitted on your behalf for the
     helpdesk at %{url}.<br />
     <br />
@@ -27,3 +28,4 @@ body: >
     <br />
     <img src="cid:b56944cb4722cc5cda9d1e23a3ea7fbc" alt="Powered by
     osTicket" width="126" height="19" style="width: 126px" />
+    </div>
diff --git a/include/i18n/en_US/templates/page/registration-client.yaml b/include/i18n/en_US/templates/page/registration-client.yaml
index 35f986ca6ad0c9fba1dec545ce15585f35b64014..cf2339700b15eb38eef8961edc0ca80ceb985bce 100644
--- a/include/i18n/en_US/templates/page/registration-client.yaml
+++ b/include/i18n/en_US/templates/page/registration-client.yaml
@@ -12,13 +12,16 @@ notes: >
     an email address verification. Please use %{link} somewhere in the body.
 name: "Welcome to %{company.name}"
 body: >
-    <h3><strong>Hi %{recipient.name.first},</strong></h3> We've created an
-    account for you at our help desk at %{url}.<br />
+    <h3><strong>Hi %{recipient.name.first},</strong></h3>
+    <div>
+    We've created an account for you at our help desk at %{url}.<br />
     <br />
     Please follow the link below to confirm your account and gain access to
     your tickets.<br />
     <br />
     <a href="%{link}">%{link}</a><br />
     <br />
-    <em style="font-size: small">Your friendly Customer Support System<br
-    />%{company.name}</em>
+    <em style="font-size: small">Your friendly Customer Support System
+    <br />
+    %{company.name}</em>
+    </div>
diff --git a/include/i18n/en_US/templates/page/registration-confirm.yaml b/include/i18n/en_US/templates/page/registration-confirm.yaml
index 293f9ba1365ca585e247e422b83c3da2dfdd188a..c7d16f1a44b512912f397bc97d931d24b78d9626 100644
--- a/include/i18n/en_US/templates/page/registration-confirm.yaml
+++ b/include/i18n/en_US/templates/page/registration-confirm.yaml
@@ -14,9 +14,9 @@ notes: >
     process.
 name: "Account registration"
 body: >
-    <p><strong>Thanks for registering for an account.</strong></p>
-    <br /><p>
+    <div><strong>Thanks for registering for an account.</strong><br/>
+    <br />
     We've just sent you an email to the address you entered. Please follow
     the link in the email to confirm your account and gain access to your
     tickets.
-    </p>
+    </div>
diff --git a/include/i18n/en_US/templates/page/registration-staff.yaml b/include/i18n/en_US/templates/page/registration-staff.yaml
index 4b323970852d8dd7b2abab8af57654f8c6b6e93c..dfd94091b584735c1922430e80687ab60687a0e7 100644
--- a/include/i18n/en_US/templates/page/registration-staff.yaml
+++ b/include/i18n/en_US/templates/page/registration-staff.yaml
@@ -11,6 +11,7 @@ notes: >
 name: "Welcome to osTicket"
 body: >
     <h3><strong>Hi %{recipient.name.first},</strong></h3>
+    <div>
     We've created an account for you at our help desk at %{url}.<br />
     <br />
     Please follow the link below to confirm your account and gain access to
@@ -18,5 +19,6 @@ body: >
     <br />
     <a href="%{link}">%{link}</a><br />
     <br />
-    <em style="font-size: small">Your friendly Customer Support System
-    <br />%{company.name}</em>
+    <em style="font-size: small">Your friendly Customer Support System<br />
+    %{company.name}</em>
+    </div>
diff --git a/include/i18n/en_US/templates/page/registration-thanks.yaml b/include/i18n/en_US/templates/page/registration-thanks.yaml
index 0cb5e16a9f7ff74a211e711548ffba6b04dbaf7e..bd5089bbed2230ecc7e0f5b959ccd12ce0aea511 100644
--- a/include/i18n/en_US/templates/page/registration-thanks.yaml
+++ b/include/i18n/en_US/templates/page/registration-thanks.yaml
@@ -13,6 +13,7 @@ notes: >
     or access existing tickets.
 name: "Account Confirmed!"
 body: >
+    <div>
     <strong>Thanks for registering for an account.</strong><br />
     <br />
     You've confirmed your email address and successfully activated your
@@ -20,3 +21,4 @@ body: >
     <br />
     <em>Your friendly support center</em><br />
     %{company.name}
+    </div>