diff --git a/app/main/views/feedback.py b/app/main/views/feedback.py
index 16c00903c..f76f6e95e 100644
--- a/app/main/views/feedback.py
+++ b/app/main/views/feedback.py
@@ -114,17 +114,10 @@ def feedback(ticket_type):
     if form.validate_on_submit():
         user_email = form.email_address.data
         user_name = form.name.data or None
-        if current_service:
-            service_string = 'Service: "{name}"\n{url}\n'.format(
-                name=current_service.name,
-                url=url_for('main.service_dashboard', service_id=current_service.id)
-            )
-        else:
-            service_string = ''
 
-        feedback_msg = '{}\n{}'.format(
-            form.feedback.data,
-            service_string,
+        feedback_msg = render_template(
+            'support-tickets/support-ticket.txt',
+            content=form.feedback.data,
         )
 
         ticket = NotifySupportTicket(
diff --git a/app/templates/support-tickets/support-ticket.txt b/app/templates/support-tickets/support-ticket.txt
new file mode 100644
index 000000000..08fd2629d
--- /dev/null
+++ b/app/templates/support-tickets/support-ticket.txt
@@ -0,0 +1,5 @@
+{{ content }}
+{% if current_service -%}
+Service: "{{ current_service.name }}"
+{{ url_for('main.service_dashboard', service_id=current_service.id, _external=True) }}
+{% endif %}
diff --git a/tests/app/main/views/test_feedback.py b/tests/app/main/views/test_feedback.py
index 4606461d2..8f73087ca 100644
--- a/tests/app/main/views/test_feedback.py
+++ b/tests/app/main/views/test_feedback.py
@@ -237,6 +237,7 @@ def test_passes_user_details_through_flow(
         url_for(
             'main.service_dashboard',
             service_id=SERVICE_ONE_ID,
+            _external=True,
         ),
         ''
     ])