diff --git a/include/i18n/en_US/templates/email/assigned.alert.yaml b/include/i18n/en_US/templates/email/assigned.alert.yaml
index 7629ae55aa9f3b80cce6ac422c6635c2eebaf022..38f1fbfa524e1687a9457a867d04a5699aabbece 100644
--- a/include/i18n/en_US/templates/email/assigned.alert.yaml
+++ b/include/i18n/en_US/templates/email/assigned.alert.yaml
@@ -5,7 +5,6 @@
# assigned automatically by the system or manually by another staff member.
# Use %{assigner} to distinguish who made the assignment.
#
-%YAML 1.0
---
notes: |
Sent to staff members when a ticket is assigned to them. Tickets can be
diff --git a/include/i18n/en_US/templates/email/message.alert.yaml b/include/i18n/en_US/templates/email/message.alert.yaml
index 2e519fe197b6635233c53d470b86b78442d7e39d..e2d67c4d634fe88aa48ab175562534bda81819ce 100644
--- a/include/i18n/en_US/templates/email/message.alert.yaml
+++ b/include/i18n/en_US/templates/email/message.alert.yaml
@@ -5,7 +5,6 @@
# This can occur if the users responds to an email from the system or visits
# the customer web portal and posts a new message there.
#
-%YAML 1.0
---
notes: |
Sent to staff members when a new message is posted by a user to a
diff --git a/include/i18n/en_US/templates/email/message.autoresp.yaml b/include/i18n/en_US/templates/email/message.autoresp.yaml
index 846a34af0c92b80f5e65c5716b8e30cf387c3ee0..ab70756b4c322d02a52739903436ddf0fcdfed5d 100644
--- a/include/i18n/en_US/templates/email/message.autoresp.yaml
+++ b/include/i18n/en_US/templates/email/message.autoresp.yaml
@@ -5,7 +5,6 @@
# happen if the users responds to an email from the system or visits the
# customer web portal and posts a new message there.
#
-%YAML 1.0
---
notes: |
Sent to a user when the user posts a new message to a ticket. This can
@@ -13,7 +12,7 @@ notes: |
customer web portal and posts a new message there.
subject: |
- "Message Confirmation"
+ Message Confirmation
body: |
<h3><strong>Dear %{ticket.name},</strong></h3>
<p>
diff --git a/include/i18n/en_US/templates/email/note.alert.yaml b/include/i18n/en_US/templates/email/note.alert.yaml
index 00e10b0c5619d4fc4f94908bf3d93470d08c08c4..84267019937f114ac3f331b170e74d2816303c02 100644
--- a/include/i18n/en_US/templates/email/note.alert.yaml
+++ b/include/i18n/en_US/templates/email/note.alert.yaml
@@ -4,7 +4,6 @@
# Sent to staff members when a new internal note is appended to a ticket.
# Internal notes can only be added by staff members.
#
-%YAML 1.0
---
notes: |
Sent to staff members when a new internal note is appended to a ticket.
diff --git a/include/i18n/en_US/templates/email/ticket.alert.yaml b/include/i18n/en_US/templates/email/ticket.alert.yaml
index 46f1aac5616d454ba233910c1568648efc06a68d..40dcdfcd68cb254fd9471444ecb1af78d4b2d981 100644
--- a/include/i18n/en_US/templates/email/ticket.alert.yaml
+++ b/include/i18n/en_US/templates/email/ticket.alert.yaml
@@ -4,7 +4,6 @@
# Sent to a staff member when a new ticket is created in the system. This
# applies to tickets created via email, the web portal, or the api.
#
-%YAML 1.0
---
notes: |
Sent to a staff member when a new ticket is created in the system. This
diff --git a/include/i18n/en_US/templates/email/ticket.autoreply.yaml b/include/i18n/en_US/templates/email/ticket.autoreply.yaml
index 10994f66c057e168e2ec684ee46f1fc8c6675962..c77c06df14c45fd0ed530aa1933700bcd9b8d3c7 100644
--- a/include/i18n/en_US/templates/email/ticket.autoreply.yaml
+++ b/include/i18n/en_US/templates/email/ticket.autoreply.yaml
@@ -4,7 +4,6 @@
# Sent to a user when an automatic canned response is posted to a ticket
# when it is created
#
-%YAML 1.0
---
notes: |
Sent to a user when an automatic canned response is posted to a ticket
diff --git a/include/i18n/en_US/templates/email/ticket.notice.yaml b/include/i18n/en_US/templates/email/ticket.notice.yaml
index 6df4af7ac9a0249a1c7b4182e601d3e7aafbb53e..59f850ae59d54cf3d5d72625cd78373908f14510 100644
--- a/include/i18n/en_US/templates/email/ticket.notice.yaml
+++ b/include/i18n/en_US/templates/email/ticket.notice.yaml
@@ -4,7 +4,6 @@
# Sent to a user when a staff member creates a ticket on the user's behalf.
# This is most commonly performed when user's call in on the phone.
#
-%YAML 1.0
---
notes: |
Sent to a user when a staff member creates a ticket on the user's behalf.
diff --git a/include/i18n/en_US/templates/email/ticket.overdue.yaml b/include/i18n/en_US/templates/email/ticket.overdue.yaml
index 0af97373f90ea919eb9e6dab0d0dcc61c29f95a4..c25a7d65724402a2da10cee12c0099f9eaa78ecd 100644
--- a/include/i18n/en_US/templates/email/ticket.overdue.yaml
+++ b/include/i18n/en_US/templates/email/ticket.overdue.yaml
@@ -5,7 +5,6 @@
# Overdue tickets occur based on the ticket's due-date as well as the SLA
# defined for the ticket.
#
-%YAML 1.0
---
notes: |
Sent to staff members when a ticket transitions to overdue in the system.
diff --git a/include/i18n/en_US/templates/email/ticket.overlimit.yaml b/include/i18n/en_US/templates/email/ticket.overlimit.yaml
index 07b19182e89303cc155b91ab43be557bef4b5c29..6be3196698b37cf7130a49ed569cc9da181b36b7 100644
--- a/include/i18n/en_US/templates/email/ticket.overlimit.yaml
+++ b/include/i18n/en_US/templates/email/ticket.overlimit.yaml
@@ -5,7 +5,6 @@
# limit is configurable in the Admin Panel, and is defined by the number of
# tickets open by a particular email address.
#
-%YAML 1.0
---
notes: |
Sent to users when they have exceeded the maximum open ticket limit. The
diff --git a/include/i18n/en_US/templates/email/ticket.reply.yaml b/include/i18n/en_US/templates/email/ticket.reply.yaml
index 50278d6221eac6cfb611030ebe185b6f21352ea6..98c7c5974c466a1abad38f738dccba2eb790c83d 100644
--- a/include/i18n/en_US/templates/email/ticket.reply.yaml
+++ b/include/i18n/en_US/templates/email/ticket.reply.yaml
@@ -4,7 +4,6 @@
# Sent to users when a staff members makes a reply to their ticket. Replies
# are only generated by staff members.
#
-%YAML 1.0
---
notes: |
Sent to users when a staff members makes a reply to their ticket.
diff --git a/include/i18n/en_US/templates/email/transfer.alert.yaml b/include/i18n/en_US/templates/email/transfer.alert.yaml
index 43d293931ec9f871ba1bc942215ecd3f4f2f7917..c8bb8fa7deca9e72f353be80bc508f4816583cbc 100644
--- a/include/i18n/en_US/templates/email/transfer.alert.yaml
+++ b/include/i18n/en_US/templates/email/transfer.alert.yaml
@@ -5,7 +5,6 @@
# assigned automatically by the system or manually by another staff member.
# Use %{assigner} to distinguish who made the assignment.
#
-%YAML 1.0
---
notes: |
diff --git a/include/i18n/en_US/templates/page/landing.yaml b/include/i18n/en_US/templates/page/landing.yaml
index f1849109841aa26f50a8b6a606c133a5dd6d2f3a..529c8e31778eb4811b5c6c66dd6d7de2aac92d20 100644
--- a/include/i18n/en_US/templates/page/landing.yaml
+++ b/include/i18n/en_US/templates/page/landing.yaml
@@ -4,7 +4,6 @@
# The landing page is served on the front page of the customer portal above
# the two links for creating new tickets and viewing ticket status.
#
-%YAML 1.0
---
notes: |
The landing page is served on the front page of the customer portal
diff --git a/include/i18n/en_US/templates/page/offline.yaml b/include/i18n/en_US/templates/page/offline.yaml
index c3f31e7da22c53b147d56e380ce675452e438eb6..f5491e88f5d7819f6ee696e560ad558050017e43 100644
--- a/include/i18n/en_US/templates/page/offline.yaml
+++ b/include/i18n/en_US/templates/page/offline.yaml
@@ -4,7 +4,6 @@
# The offline page is served to the customer portal when the help desk is
# configured offline in the Admin Panel
#
-%YAML 1.0
---
notes: |
The offline page is served to the customer portal when the help desk is
diff --git a/include/i18n/en_US/templates/page/thank-you.yaml b/include/i18n/en_US/templates/page/thank-you.yaml
index 96f04880451aa78bba8e0af63a91fb8ff3774ee2..27365b340d82c7df2876792bee96aee2fb021c94 100644
--- a/include/i18n/en_US/templates/page/thank-you.yaml
+++ b/include/i18n/en_US/templates/page/thank-you.yaml
@@ -4,7 +4,6 @@
# The thank-you page is served to the customer portal when a user submites a
# new ticket via the customer portal.
#
-%YAML 1.0
---
notes: |
The thank-you page is served to the customer portal when a user submites