diff --git a/app/main/views/jobs.py b/app/main/views/jobs.py
index 15c21e65c..9469fa810 100644
--- a/app/main/views/jobs.py
+++ b/app/main/views/jobs.py
@@ -58,7 +58,8 @@ def view_job(service_id, job_id):
             uploaded_file_name=job['original_file_name'],
             uploaded_file_time=job['created_at'],
             template=Template(
-                templates_dao.get_service_template_or_404(service_id, job['template'])['data']
+                templates_dao.get_service_template_or_404(service_id, job['template'])['data'],
+                prefix=service['name']
             ),
             service_id=service_id,
             service=service
diff --git a/app/main/views/send.py b/app/main/views/send.py
index dc52d55cf..cfdbd97d3 100644
--- a/app/main/views/send.py
+++ b/app/main/views/send.py
@@ -51,7 +51,10 @@ def choose_template(service_id, template_type):
     return render_template(
         'views/choose-template.html',
         templates=[
-            Template(template) for template in templates_dao.get_service_templates(service_id)['data']
+            Template(
+                template,
+                prefix=service['name']
+            ) for template in templates_dao.get_service_templates(service_id)['data']
             if template['template_type'] == template_type
         ],
         template_type=template_type,
@@ -84,7 +87,8 @@ def send_messages(service_id, template_id):
 
     service = services_dao.get_service_by_id_or_404(service_id)
     template = Template(
-        templates_dao.get_service_template_or_404(service_id, template_id)['data']
+        templates_dao.get_service_template_or_404(service_id, template_id)['data'],
+        prefix=service['name']
     )
 
     return render_template(
@@ -155,7 +159,8 @@ def check_messages(service_id, upload_id):
         template = Template(
             raw_template,
             values=upload_result['rows'][0] if upload_result['valid'] else {},
-            drop_values={'to'}
+            drop_values={'to'},
+            prefix=service['name']
         )
         return render_template(
             'views/check.html',
diff --git a/app/templates/views/check.html b/app/templates/views/check.html
index 48967ca7a..315bc32eb 100644
--- a/app/templates/views/check.html
+++ b/app/templates/views/check.html
@@ -32,14 +32,16 @@
   {% if 'email' == template.template_type %}
     {{ email_message(
       template.subject,
-      template,
+      template.replaced if upload_result.valid else template.formatted_as_markup,
       from_address='{}@notifications.service.gov.uk'.format(service.email_from),
       from_name=service.name
     )}}
   {% elif 'sms' == template.template_type %}
     <div class="grid-row">
       <div class="column-two-thirds">
-        {{ sms_message(template)}}
+        {{ sms_message(
+          template.replaced if upload_result.valid else template.formatted_as_markup
+        )}}
       </div>
     </div>
   {% endif %}
diff --git a/app/templates/views/send.html b/app/templates/views/send.html
index f98c819b1..25eda7364 100644
--- a/app/templates/views/send.html
+++ b/app/templates/views/send.html
@@ -16,13 +16,13 @@
   {% if 'sms' == template.template_type %}
     <div class="grid-row">
       <div class="column-two-thirds">
-        {{ sms_message(template) }}
+        {{ sms_message(template.formatted_as_markup) }}
       </div>
     </div>
   {% elif 'email' == template.template_type %}
     {{ email_message(
       template.subject,
-      template,
+      template.formatted_as_markup,
       from_address='{}@notifications.service.gov.uk'.format(service.email_from),
       from_name=service.name
     ) }}
diff --git a/requirements.txt b/requirements.txt
index cbb153dd6..2c746a497 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -14,4 +14,4 @@ Pygments==2.0.2
 
 git+https://github.com/alphagov/notifications-python-client.git@0.2.8#egg=notifications-python-client==0.2.8
 
-git+https://github.com/alphagov/notifications-utils.git@0.1.1#egg=notifications-utils==0.1.1
+git+https://github.com/alphagov/notifications-utils.git@0.1.2#egg=notifications-utils==0.1.2