4 files changed, 25 insertions, 25 deletions

diff --git a/templates/email/default/alert-update.html b/templates/email/default/alert-update.html
index 8c392685d..c1a7562cd 100644
--- a/templates/email/default/alert-update.html
+++ b/templates/email/default/alert-update.html
@@ -1,6 +1,6 @@
 [%
 
-title = title | html;
+title = report.title | html;
 email_summary = "New updates on “" _ title _ "”";
 email_columns = 2;
 
@@ -19,7 +19,7 @@ INCLUDE '_email_top.html';
 </th>
 [% WRAPPER '_email_sidebar.html' object = report %]
     <h2 style="[% h2_style %]">[% title | html %]</h2>
-    <p style="[% secondary_p_style %]">[% detail | html %]</p>
+    <p style="[% secondary_p_style %]">[% report.detail | html %]</p>
 [% END %]
 
 [% INCLUDE '_email_bottom.html' %]
diff --git a/templates/email/default/alert-update.txt b/templates/email/default/alert-update.txt
index 3bf9e4377..2883fee5e 100644
--- a/templates/email/default/alert-update.txt
+++ b/templates/email/default/alert-update.txt
@@ -1,7 +1,7 @@
-Subject: New [% site_name %] updates on report: '[% title %]'
+Subject: New [% site_name %] updates on report: '[% report.title %]'
 
 You asked us to send you an email every time an update was made to the
-[% site_name %] report: [% title %].
+[% site_name %] report: [% report.title %].
 
 The following updates have been left on this report:
 
@@ -22,7 +22,7 @@ please do not reply to it.
 Unsubscribe?
 
 We currently email you whenever someone leaves an update on the
-[% site_name %] report: [% title %].
+[% site_name %] report: [% report.title %].
 
 If you no longer wish to receive an email whenever this report is updated,
 please follow this link: [% unsubscribe_url %]
diff --git a/templates/email/default/submit.html b/templates/email/default/submit.html
index 582670f98..8dc06041e 100644
--- a/templates/email/default/submit.html
+++ b/templates/email/default/submit.html
@@ -23,38 +23,36 @@ 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 %]">[% 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 %]">[% report.category | html %]</p>
+    <p style="[% secondary_p_style %]">[% report.detail | html %]</p>
     <p style="[% secondary_p_style %]">
       <strong>Location:</strong>
       <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/default/submit.txt b/templates/email/default/submit.txt
index 8c88a17f8..f08e723a8 100644
--- a/templates/email/default/submit.txt
+++ b/templates/email/default/submit.txt
@@ -1,4 +1,4 @@
-Subject: Problem Report: [% title %]
+Subject: Problem Report: [% report.title %]
 
 Dear [% bodies_name %],
 
@@ -13,19 +13,21 @@ 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 %]
 
-Latitude: [% latitude %]
+Details: [% report.detail %]
 
-Longitude: [% longitude %]
+Latitude: [% report.latitude %]
+
+Longitude: [% report.longitude %]
 
 View OpenStreetMap of this location: [% osm_url %]