diff --git a/app/templates/views/service-settings/email_reply_to.html b/app/templates/views/service-settings/email_reply_to.html
index 60c88d6bb..958cba3ed 100644
--- a/app/templates/views/service-settings/email_reply_to.html
+++ b/app/templates/views/service-settings/email_reply_to.html
@@ -18,24 +18,34 @@
   <div class="user-list">
     {% if not current_service.email_reply_to_addresses %}
       <div class="user-list-item">
-        <span class="hint">You have not added any reply-to email addresses yet</span>
+        <p class="govuk-body user-list-item-blank hint">You have not added any reply-to email addresses yet</p>
       </div>
     {% endif %}
     {% for item in current_service.email_reply_to_addresses %}
       <div class="user-list-item">
-        <h2 class="user-list-item-heading">
-          <span class="heading-small">{{ item.email_address }}</span>&ensp;<span class="hint">
-            {%- if item.is_default -%}
-              (default)
+        <div class="govuk-grid-row">
+          <div class="govuk-grid-column-three-quarters">
+            <h2 class="user-list-item-heading">
+              <span class="heading-small">{{ item.email_address }}</span>&ensp;<span class="hint">
+                {%- if item.is_default -%}
+                  (default)
+                {% endif %}
+              </span>
+            </h2>
+          </div>
+          <div class="govuk-grid-column-one-quarter">
+            {% if current_user.has_permissions('manage_service') %}
+              <a class="govuk-link govuk-link--no-visited-state user-list-edit-link" href="{{ url_for('.service_edit_email_reply_to', service_id =current_service.id, reply_to_email_id = item.id) }}">Change</a>
             {% endif %}
-          </span>
-        </h2>
-        {% if current_user.has_permissions('manage_service') %}
-          <a class="govuk-link govuk-link--no-visited-state user-list-edit-link" href="{{ url_for('.service_edit_email_reply_to', service_id =current_service.id, reply_to_email_id = item.id) }}">Change</a>
-        {% endif %}
-        {% if current_service.count_email_reply_to_addresses > 1 %}
-          {{ api_key(item.id, name=item.email_address, thing="ID") }}
-        {% endif %}
+          </div>
+        </div>
+        <div class="govuk-grid-row">
+          <div class="govuk-grid-column-full">
+            {% if current_service.count_email_reply_to_addresses > 1 %}
+              {{ api_key(item.id, name=item.email_address, thing="ID") }}
+            {% endif %}
+          </div>
+        </div>
       </div>
     {% endfor %}
   </div>