2 files changed, 20 insertions, 20 deletions
diff --git a/templates/email/fixmystreet.com/submit.html b/templates/email/fixmystreet.com/submit.html
index 24bb5f86f..2742c4b44 100644
--- a/templates/email/fixmystreet.com/submit.html
+++ b/templates/email/fixmystreet.com/submit.html
@@ -23,34 +23,32 @@ of a local problem that they believe might require your attention.</p>
   <table [% table_reset %]>
     <tr>
       <th style="[% contact_th_style %]">Name</th>
-      <td style="[% contact_td_style %]">[% name | html %]</td>
+      <td style="[% contact_td_style %]">[% report.name | html %]</td>
     </tr>
     <tr>
       <th style="[% contact_th_style %]">Email</th>
       <td style="[% contact_td_style %]">
-        [%~ IF email ~%]
-          <a href="mailto:[% email | html %]">[% email | html %]</a>
+        [%~ IF report.user.email ~%]
+          <a href="mailto:[% report.user.email | html %]">[% report.user.email | html %]</a>
         [%~ ELSE ~%]
           <strong>No email address provided, only phone number</strong>
         [%~ END ~%]
       </td>
     </tr>
-    [%~ IF phone %]
+    [%~ IF report.user.phone %]
       <tr>
         <th style="[% contact_th_style %]">Phone</th>
-        <td style="[% contact_td_style %]"><a href="tel:[% phone | html %]">[% phone | html %]</a></td>
+        <td style="[% contact_td_style %]"><a href="tel:[% report.user.phone | html %]">[% report.user.phone | html %]</a></td>
       </tr>
     [%~ END %]
   </table>
-  <p style="[% p_style %] margin-top: 0.5em;">Replies to this message will go directly to [% name | html %], the user who reported the problem.</p>
+  <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 %]
 </th>
 [% WRAPPER '_email_sidebar.html' object = report %]
-    <h2 style="[% h2_style %]">[% title | html %]</h2>
-    [%~ IF category_line %]
-    <p style="[% secondary_p_style %]"><strong>Category:</strong> [% category | html %]</p>
-    [%~ END %]
-    <p style="[% secondary_p_style %]">[% detail | html %]</p>
+    <h2 style="[% h2_style %]">[% report.title | html %]</h2>
+    <p style="[% secondary_p_style %]"><strong>Category:</strong> [% report.category | html %]</p>
+    <p style="[% secondary_p_style %]">[% report.detail | html %]</p>
     [%~ IF additional_information %]
     <p style="[% secondary_p_style %]">[% additional_information %]</p>
     [%~ END %]
@@ -60,7 +58,7 @@ of a local problem that they believe might require your attention.</p>
       [%~ " (IE)" IF coordsyst == "I" ~%]
       : [% easting %]/[% northing %]
       (<a href="[% osm_url %]" title="View OpenStreetMap of this location">
-        [%~ latitude %], [% longitude ~%]
+        [%~ report.latitude %], [% report.longitude ~%]
       </a>)
       [% IF closest_address %]<br>[% closest_address | trim | replace("\n\n", "<br>") %][% END %]
     </p>
diff --git a/templates/email/fixmystreet.com/submit.txt b/templates/email/fixmystreet.com/submit.txt
index 5bcbef87b..3eaf400a2 100644
--- a/templates/email/fixmystreet.com/submit.txt
+++ b/templates/email/fixmystreet.com/submit.txt
@@ -1,4 +1,4 @@
-Subject: Problem Report: [% title %]
+Subject: Problem Report: [% report.title %]
 
 Dear [% bodies_name %],
 
@@ -13,15 +13,17 @@ please visit the following link:
 
 [% has_photo %]----------
 
-Name: [% name %]
+Name: [% report.name %]
 
-Email: [% email OR 'None provided' %]
+Email: [% report.user.email OR 'None provided' %]
 
-Phone: [% phone OR 'None provided' %]
+Phone: [% report.user.phone OR 'None provided' %]
 
-[% category_line %]Subject: [% title %]
+Category: [% report.category %]
 
-Details: [% detail %]
+Subject: [% report.title %]
+
+Details: [% report.detail %]
 
 [% additional_information %]
 
@@ -29,9 +31,9 @@ Easting/Northing
 [%- " (IE)" IF coordsyst == "I" -%]
 : [% easting %]/[% northing %]
 
-Latitude: [% latitude %]
+Latitude: [% report.latitude %]
 
-Longitude: [% longitude %]
+Longitude: [% report.longitude %]
 
 View OpenStreetMap of this location: [% osm_url %]