13 files changed, 28 insertions, 28 deletions
diff --git a/templates/email/default/_email_bottom.html b/templates/email/default/_email_bottom.html
index 4967dfaa2..13c5c019f 100644
--- a/templates/email/default/_email_bottom.html
+++ b/templates/email/default/_email_bottom.html
@@ -4,12 +4,12 @@
       <th class="spacer-cell"></th>
     </tr>
   </table>
-  <table [% wrapper_table %] style="[% wrapper_style %]">
+  <table [% wrapper_table | safe %] style="[% wrapper_style %]">
     <tr>
       <th class="spacer-cell"></th>
       <th width="[% wrapper_max_width %]" style="[% td_style %][% hint_style %]" class="hint">
         [%~ IF email_footer %]
-          [% email_footer %]
+          [% email_footer | safe %]
         [%~ ELSE %]
           This email was sent automatically, from an unmonitored email account. Please do not reply to it.
         [%~ END %]
diff --git a/templates/email/default/_email_sidebar.html b/templates/email/default/_email_sidebar.html
index e762bc140..b90a55c28 100644
--- a/templates/email/default/_email_sidebar.html
+++ b/templates/email/default/_email_sidebar.html
@@ -16,10 +16,10 @@ DEFAULT url = cobrand.base_url_for_report(report) _ report.url
   [% IF url %]
   <a href="[% url %]"><img style="[% map_image_style %]" src="[% inline_image(report.static_map, 'map.jpeg') %]" width="310" height="200" alt=""></a>
   [% END %]
-  [% start_padded_box %]
+  [% start_padded_box | safe %]
     [%~ IF object.photo %]
       <img style="[% preview_photo_style %]" src="[% inline_image(object.get_first_image_fp) %]" alt="" align="right">
     [%~ END %]
-    [%~ content %]
-  [% end_padded_box %]
+    [%~ content | safe %]
+  [% end_padded_box | safe %]
 </th>
diff --git a/templates/email/default/_email_top.html b/templates/email/default/_email_top.html
index f7869ddb4..c4622818d 100644
--- a/templates/email/default/_email_top.html
+++ b/templates/email/default/_email_top.html
@@ -47,7 +47,7 @@
   </style>
 </head>
 <body style="[% body_style %]">
-  <table [% wrapper_table %] style="[% wrapper_style %]">
+  <table [% wrapper_table | safe %] style="[% wrapper_style %]">
     <tr>
       <th class="spacer-cell"></th>
       <th width="[% wrapper_max_width %]" style="[% td_style %][% hint_style %]" class="hint">
@@ -56,11 +56,11 @@
       <th class="spacer-cell"></th>
     </tr>
   </table>
-  <table [% wrapper_table %] style="[% wrapper_style %]">
+  <table [% wrapper_table | safe %] style="[% wrapper_style %]">
     <tr>
       <th class="spacer-cell"></th>
       <th width="[% wrapper_max_width %]" style="[% td_style %] min-width: [% wrapper_min_width %]px;" id="main">
-        <table [% table_reset %]>
+        <table [% table_reset | safe %]>
           <tr>
             <th colspan="[% email_columns %]" style="[% td_style %][% header_style %]">
               [%~ IF file_exists("web/cobrands/${ img_dir }/images/${ logo_file }") ~%]
diff --git a/templates/email/default/alert-update.html b/templates/email/default/alert-update.html
index 082f5e369..e026cf146 100644
--- a/templates/email/default/alert-update.html
+++ b/templates/email/default/alert-update.html
@@ -11,11 +11,11 @@ INCLUDE '_email_top.html';
 %]
 
 <th style="[% td_style %][% primary_column_style %]" id="primary_column">
-  [% start_padded_box %]
+  [% start_padded_box | safe %]
   <h1 style="[% h1_style %]">New updates on <a href="[% problem_url %]">[% title %]</a></h1>
   [%~ INCLUDE '_email_comment_list.html' %]
   <p style="[% p_style %]"><a href="[% unsubscribe_url %]">Unsubscribe from alerts about this report</a></p>
-  [% end_padded_box %]
+  [% end_padded_box | safe %]
 </th>
 [% WRAPPER '_email_sidebar.html' object = report %]
     <h2 style="[% h2_style %]">[% title %]</h2>
diff --git a/templates/email/default/contact.html b/templates/email/default/contact.html
index 33c858dfb..6eac4282a 100644
--- a/templates/email/default/contact.html
+++ b/templates/email/default/contact.html
@@ -13,7 +13,7 @@ INCLUDE '_email_top.html';
 %]
 
 <th style="[% td_style %][% contact_meta_style %]">
-  <table [% table_reset %]>
+  <table [% table_reset | safe %]>
     <tr>
       <th style="[% contact_th_style %]">From</th>
       <td style="[% contact_td_style %]">
diff --git a/templates/email/default/other-reported.html b/templates/email/default/other-reported.html
index 584c5b89e..07a36b6f3 100644
--- a/templates/email/default/other-reported.html
+++ b/templates/email/default/other-reported.html
@@ -9,7 +9,7 @@ INCLUDE '_email_top.html';
 %]
 
 <th style="[% td_style %][% primary_column_style %]" id="primary_column">
-  [% start_padded_box %]
+  [% start_padded_box | safe %]
   <h1 style="[% h1_style %]">Your report has been&nbsp;logged</h1>
   <p style="[% p_style %]">Your report to [% report.body %] has been logged on [% site_name %].</p>
 [% IF cobrand.is_council && !cobrand.owns_problem( report ) %]
@@ -21,7 +21,7 @@ of report, so it will instead be sent to [% report.body %].</p>
   <p style="margin: 20px auto; text-align: center">
   <a style="[% button_style %]" href="[% cobrand.base_url_for_report(report) %][% report.url %]">View my report</a>
   </p>
-  [% end_padded_box %]
+  [% end_padded_box | safe %]
 </th>
 [% WRAPPER '_email_sidebar.html' object = report %]
     <h2 style="[% h2_style %]">[% report.title | html %]</h2>
diff --git a/templates/email/default/other-updated.html b/templates/email/default/other-updated.html
index e7f09e123..2609b0027 100644
--- a/templates/email/default/other-updated.html
+++ b/templates/email/default/other-updated.html
@@ -9,14 +9,14 @@ INCLUDE '_email_top.html';
 %]
 
 <th style="[% td_style %][% primary_column_style %]" id="primary_column">
-  [% start_padded_box %]
+  [% start_padded_box | safe %]
   <h1 style="[% h1_style %]">Your update has been&nbsp;logged</h1>
   <p style="[% p_style %]">Your update has been logged on [% site_name %].</p>
   [% TRY %][% INCLUDE '_council_reference.html' %][% CATCH file %][% END %]
   <p style="margin: 20px auto; text-align: center">
   <a style="[% button_style %]" href="[% cobrand.base_url_for_report(problem) %][% update.url %]">View my update</a>
   </p>
-  [% end_padded_box %]
+  [% end_padded_box | safe %]
 </th>
 [% WRAPPER '_email_sidebar.html'
     object = update
diff --git a/templates/email/default/problem-confirm-not-sending.html b/templates/email/default/problem-confirm-not-sending.html
index 827a49d55..43a4c6372 100644
--- a/templates/email/default/problem-confirm-not-sending.html
+++ b/templates/email/default/problem-confirm-not-sending.html
@@ -10,7 +10,7 @@ INCLUDE '_email_top.html';
 %]
 
 <th style="[% td_style %][% primary_column_style %]" id="primary_column">
-  [% start_padded_box %]
+  [% start_padded_box | safe %]
   <h1 style="[% h1_style %]">Please confirm your&nbsp;report</h1>
   <p style="[% p_style %]">Please click on the link below to confirm that you want your report to appear
 on [% site_name %], despite not being sent to the
@@ -20,7 +20,7 @@ council.</p>
     <a style="[% button_style %]" href="[% token_url %]">Yes, publish my report</a>
   </p>
   <p style="[% p_style %]">If you no longer wish to publish this report, please take no further action.</p>
-  [% end_padded_box %]
+  [% end_padded_box | safe %]
 </th>
 [% WRAPPER '_email_sidebar.html' object = report, url = token_url %]
     <h2 style="[% h2_style %]">[% report.title | html %]</h2>
diff --git a/templates/email/default/problem-confirm.html b/templates/email/default/problem-confirm.html
index b8c98534c..b94a008f7 100644
--- a/templates/email/default/problem-confirm.html
+++ b/templates/email/default/problem-confirm.html
@@ -10,7 +10,7 @@ INCLUDE '_email_top.html';
 %]
 
 <th style="[% td_style %][% primary_column_style %]" id="primary_column">
-  [% start_padded_box %]
+  [% start_padded_box | safe %]
   <h1 style="[% h1_style %]">Please confirm your&nbsp;report</h1>
   <p style="[% p_style %]">Please click on the link below to confirm that you want to send your report to [% report.body %].
 [% IF c.cobrand.is_council && !c.cobrand.owns_problem( report ) %]
@@ -25,7 +25,7 @@ of problem, so it will instead be sent to [% report.body %].
     <a style="[% button_style %]" href="[% token_url %]">Yes, send my report</a>
   </p>
   <p style="[% p_style %]">If you no longer wish to send this report, please take no further action.</p>
-  [% end_padded_box %]
+  [% end_padded_box | safe %]
 </th>
 [% WRAPPER '_email_sidebar.html' object = report, url = token_url %]
     <h2 style="[% h2_style %]">[% report.title | html %]</h2>
diff --git a/templates/email/default/problem-moderated.html b/templates/email/default/problem-moderated.html
index 142f27fc2..915bb4138 100644
--- a/templates/email/default/problem-moderated.html
+++ b/templates/email/default/problem-moderated.html
@@ -10,7 +10,7 @@ INCLUDE '_email_top.html';
 %]
 
 <th style="[% td_style %][% primary_column_style %]" id="primary_column">
-  [% start_padded_box %]
+  [% start_padded_box | safe %]
   <h1 style="[% h1_style %]">Your report has been&nbsp;moderated</h1>
 [% IF types == 'hide' -%]
   <p style="[% p_style %]">The report has been hidden from the site.</p>
@@ -22,7 +22,7 @@ INCLUDE '_email_top.html';
 [% END -%]
   <p style="[% p_style %]">If you do not think that this report should have been moderated, you may contact
 the team at <a href="[% report_complain_uri %]">[% report_complain_uri %]</a></p>
-  [% end_padded_box %]
+  [% end_padded_box | safe %]
 </th>
 [% WRAPPER '_email_sidebar.html' object = problem %]
     <h2 style="[% h2_style %]">[% moderated_data.title | html %]</h2>
diff --git a/templates/email/default/questionnaire.html b/templates/email/default/questionnaire.html
index eaa570ae0..bc0b6dbd5 100644
--- a/templates/email/default/questionnaire.html
+++ b/templates/email/default/questionnaire.html
@@ -11,7 +11,7 @@ INCLUDE '_email_top.html';
 %]
 
 <th style="[% td_style %][% primary_column_style %]" id="primary_column">
-  [% start_padded_box %]
+  [% start_padded_box | safe %]
   <h1 style="[% h1_style %]">Has your problem been&nbsp;fixed?</h1>
   <p style="[% p_style %]">[% created %] ago, you reported a problem using [% site_name %].</p>
   <p style="[% p_style %]">Help us keep [% site_name %] up to date by letting us know whether the problem has been fixed yet:</p>
@@ -23,7 +23,7 @@ INCLUDE '_email_top.html';
     <a style="[% dontknow_button_style %]" href="[% url %]?been_fixed=Unknown">Don’t know</a>
   </p>
   <p style="[% p_style %]">Thank you! Your feedback is really valuable.</p>
-  [% end_padded_box %]
+  [% end_padded_box | safe %]
 </th>
 [% WRAPPER '_email_sidebar.html' object = report, url = url %]
     <h2 style="[% h2_style %]">[% title %]</h2>
diff --git a/templates/email/default/submit.html b/templates/email/default/submit.html
index 8dc06041e..0fed5770f 100644
--- a/templates/email/default/submit.html
+++ b/templates/email/default/submit.html
@@ -11,7 +11,7 @@ INCLUDE '_email_top.html';
 %]
 
 <th style="[% td_style %][% primary_column_style %]" id="primary_column">
-  [% start_padded_box %]
+  [% start_padded_box | safe %]
   <h1 style="[% h1_style %]">New problem in your&nbsp;area</h1>
   <p style="[% p_style %]">[% missing %][% multiple %]A user of [% site_name %] has submitted the following report
 of a local problem that they believe might require your attention.</p>
@@ -20,7 +20,7 @@ of a local problem that they believe might require your attention.</p>
     <a style="[% button_style %]" href="[% url %]">Show full report</a>
   </p>
   <h2 style="[% h2_style %] margin: 30px 0 10px 0">Reported by:</h2>
-  <table [% table_reset %]>
+  <table [% table_reset | safe %]>
     <tr>
       <th style="[% contact_th_style %]">Name</th>
       <td style="[% contact_td_style %]">[% report.name | html %]</td>
@@ -43,7 +43,7 @@ of a local problem that they believe might require your attention.</p>
     [%~ END %]
   </table>
   <p style="[% p_style %] margin-top: 0.5em;">Replies to this message will go directly to [% report.name | html %], the user who reported the problem.</p>
-  [% end_padded_box %]
+  [% end_padded_box | safe %]
 </th>
 [% WRAPPER '_email_sidebar.html' object = report %]
     <h2 style="[% h2_style %]">[% report.title | html %]</h2>
diff --git a/templates/email/default/update-confirm.html b/templates/email/default/update-confirm.html
index c2a39c0e5..888511346 100644
--- a/templates/email/default/update-confirm.html
+++ b/templates/email/default/update-confirm.html
@@ -10,7 +10,7 @@ INCLUDE '_email_top.html';
 %]
 
 <th style="[% td_style %][% primary_column_style %]" id="primary_column">
-  [% start_padded_box %]
+  [% start_padded_box | safe %]
   <h1 style="[% h1_style %]">Please confirm your&nbsp;update</h1>
   <p style="[% p_style %]">Please click on the link below to confirm your update on [% site_name %].</p>
   <p style="margin: 20px auto; text-align: center">
@@ -18,7 +18,7 @@ INCLUDE '_email_top.html';
   </p>
   <p style="[% p_style %]">[% INCLUDE 'update-confirm-donotsend.txt' %]</p>
   <p style="[% p_style %]">If you no longer wish to confirm this update, please take no further action.</p>
-  [% end_padded_box %]
+  [% end_padded_box | safe %]
 </th>
 [% WRAPPER '_email_sidebar.html'
     object = update