8 files changed, 14 insertions, 10 deletions
diff --git a/templates/email/fixamingata/alert-problem-area.txt b/templates/email/fixamingata/alert-problem-area.txt
index 29e3bb83f..09ded3c46 100644
--- a/templates/email/fixamingata/alert-problem-area.txt
+++ b/templates/email/fixamingata/alert-problem-area.txt
@@ -2,7 +2,7 @@ Subject: Nya rapporter i [% area_name %] på FixaMinGata
 
 Följande nya rapporter har lagts till inom [% area_name %]:
 
-[% data %]
+[% INCLUDE '_email_report_list.txt' %]
 
 [% signature %]
 
diff --git a/templates/email/fixamingata/alert-problem-council.txt b/templates/email/fixamingata/alert-problem-council.txt
index 29e3bb83f..09ded3c46 100644
--- a/templates/email/fixamingata/alert-problem-council.txt
+++ b/templates/email/fixamingata/alert-problem-council.txt
@@ -2,7 +2,7 @@ Subject: Nya rapporter i [% area_name %] på FixaMinGata
 
 Följande nya rapporter har lagts till inom [% area_name %]:
 
-[% data %]
+[% INCLUDE '_email_report_list.txt' %]
 
 [% signature %]
 
diff --git a/templates/email/fixamingata/alert-problem-nearby.txt b/templates/email/fixamingata/alert-problem-nearby.txt
index 0462568ac..657ef820a 100644
--- a/templates/email/fixamingata/alert-problem-nearby.txt
+++ b/templates/email/fixamingata/alert-problem-nearby.txt
@@ -2,7 +2,7 @@ Subject: Nya rapporter på FixMyStreet
 
 Följande rapporter har nyligen lagts till på:
 
-[% data %]
+[% INCLUDE '_email_report_list.txt' %]
 
 [% signature %]
 
diff --git a/templates/email/fixamingata/alert-problem-ward.txt b/templates/email/fixamingata/alert-problem-ward.txt
index 29e3bb83f..09ded3c46 100644
--- a/templates/email/fixamingata/alert-problem-ward.txt
+++ b/templates/email/fixamingata/alert-problem-ward.txt
@@ -2,7 +2,7 @@ Subject: Nya rapporter i [% area_name %] på FixaMinGata
 
 Följande nya rapporter har lagts till inom [% area_name %]:
 
-[% data %]
+[% INCLUDE '_email_report_list.txt' %]
 
 [% signature %]
 
diff --git a/templates/email/fixamingata/alert-problem.txt b/templates/email/fixamingata/alert-problem.txt
index 0462568ac..657ef820a 100644
--- a/templates/email/fixamingata/alert-problem.txt
+++ b/templates/email/fixamingata/alert-problem.txt
@@ -2,7 +2,7 @@ Subject: Nya rapporter på FixMyStreet
 
 Följande rapporter har nyligen lagts till på:
 
-[% data %]
+[% INCLUDE '_email_report_list.txt' %]
 
 [% signature %]
 
diff --git a/templates/email/fixamingata/alert-update.txt b/templates/email/fixamingata/alert-update.txt
index 89a9681a8..c5facfca7 100644
--- a/templates/email/fixamingata/alert-update.txt
+++ b/templates/email/fixamingata/alert-update.txt
@@ -8,7 +8,7 @@ uppdateringar, klicka på följande länk:
 Följande uppdatering har lämnats för rapporten
 [% title %]:
 
-[% data %]
+[% INCLUDE '_email_comment_list.txt' %]
 
 [% state_message %]
 
diff --git a/templates/email/fixamingata/contact.txt b/templates/email/fixamingata/contact.txt
index aab7f400f..e08612778 100644
--- a/templates/email/fixamingata/contact.txt
+++ b/templates/email/fixamingata/contact.txt
@@ -1,3 +1,7 @@
 Subject: [% subject %] (via FixaMinGata)
 
 [% message %]
+
+[% IF complaint %]
+[ [% complaint %] - [% problem_url %] - [% admin_url %] ]
+[% END %]
diff --git a/templates/email/fixamingata/questionnaire.txt b/templates/email/fixamingata/questionnaire.txt
index cd065d1f1..b59bb8415 100644
--- a/templates/email/fixamingata/questionnaire.txt
+++ b/templates/email/fixamingata/questionnaire.txt
@@ -1,6 +1,6 @@
-Subject: Frågeformulär om '[% title %]'
+Subject: Frågeformulär om '[% report.title %]'
 
-Hej [% name %],
+Hej [% report.name %],
 
 OBS! Du kan inte svara på detta brev. För att se eller svara på dessa
 uppdateringar, klicka på följande länk:
@@ -19,6 +19,6 @@ kommentarsfältet i frågeformuläret.
 
 Ditt rapporterade problem var enligt nedan:
 
-[% title %]
+[% report.title %]
 
-[% detail %]
+[% report.detail %]