From 8d8c66e94eabec274403d431eac61072e323c09b Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Thu, 29 Nov 2018 11:26:19 +0000
Subject: [PATCH 1/5] Updated reply-to address content

Updated reply-to address content to better explain why users need to add a reply-to address.
---
 .../views/service-settings/email_reply_to.html  | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/templates/views/service-settings/email_reply_to.html b/app/templates/views/service-settings/email_reply_to.html
index 12d3fceb6..0efcf018f 100644
--- a/app/templates/views/service-settings/email_reply_to.html
+++ b/app/templates/views/service-settings/email_reply_to.html
@@ -48,20 +48,19 @@
   <div class="grid-row">
     <div class="column-five-sixths">
       <p>
-        Your emails will be sent from
-        {{ current_service.email_from }}@notifications.service.gov.uk
+        You need to add at least one reply-to address so recipients can reply to your messages.
       </p>
       <p>
-        This is so they have the best chance of being delivered.
-        This email address can’t receive replies.
+        Emails with a reply-to address:
       </p>
-      <p>
-        Set up separate email addresses to receive replies
-        from your users.
-        {% if current_service.trial_mode and not current_service.has_email_reply_to_address %}
+      <ul class="list list-bullet">
+	      <li>are less likely to be labelled as spam</li>
+	      <li>appear more trustworthy</li>
+	    </ul>
+        <!--{% if current_service.trial_mode and not current_service.has_email_reply_to_address %}
           Your service can’t go live until you’ve added at least one
           reply-to address.
-        {% endif %}
+        {% endif %}-->
       </p>
     </div>
   </div>

From b9234227fd7ad3fe04f033dd920c913270240fee Mon Sep 17 00:00:00 2001
From: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>
Date: Thu, 29 Nov 2018 11:33:38 +0000
Subject: [PATCH 2/5] Added description

Added description of what a reply-to address should and should not be.
---
 app/templates/views/service-settings/email-reply-to/add.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/templates/views/service-settings/email-reply-to/add.html b/app/templates/views/service-settings/email-reply-to/add.html
index 63cf9e4e2..5999bb0d5 100644
--- a/app/templates/views/service-settings/email-reply-to/add.html
+++ b/app/templates/views/service-settings/email-reply-to/add.html
@@ -13,6 +13,8 @@
   <h1 class="heading-large">
     Add email reply-to address
   </h1>
+<p>Let recipients send replies to a shared inbox that's managed by your team.</p>
+<p>Do not use your own email address for replies.</p>
   {% call form_wrapper() %}
     {{ textbox(
       form.email_address,

From 4e3ddb22dc211a8378189379383abdf6c0fbfd68 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Mon, 3 Dec 2018 13:55:14 +0000
Subject: [PATCH 3/5] Remove go-live requirement content

---
 .../views/service-settings/email_reply_to.html        | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/app/templates/views/service-settings/email_reply_to.html b/app/templates/views/service-settings/email_reply_to.html
index 0efcf018f..bf2ddbfb3 100644
--- a/app/templates/views/service-settings/email_reply_to.html
+++ b/app/templates/views/service-settings/email_reply_to.html
@@ -54,14 +54,9 @@
         Emails with a reply-to address:
       </p>
       <ul class="list list-bullet">
-	      <li>are less likely to be labelled as spam</li>
-	      <li>appear more trustworthy</li>
-	    </ul>
-        <!--{% if current_service.trial_mode and not current_service.has_email_reply_to_address %}
-          Your service can’t go live until you’ve added at least one
-          reply-to address.
-        {% endif %}-->
-      </p>
+        <li>are less likely to be labelled as spam</li>
+        <li>appear more trustworthy</li>
+      </ul>
     </div>
   </div>
 {% endblock %}

From fb73fd228c91ab8bf5145b13679d040c0bd795d5 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Mon, 3 Dec 2018 13:55:47 +0000
Subject: [PATCH 4/5] Fix indentation

---
 .../views/service-settings/email-reply-to/add.html        | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/templates/views/service-settings/email-reply-to/add.html b/app/templates/views/service-settings/email-reply-to/add.html
index 5999bb0d5..a0fcd044a 100644
--- a/app/templates/views/service-settings/email-reply-to/add.html
+++ b/app/templates/views/service-settings/email-reply-to/add.html
@@ -13,8 +13,12 @@
   <h1 class="heading-large">
     Add email reply-to address
   </h1>
-<p>Let recipients send replies to a shared inbox that's managed by your team.</p>
-<p>Do not use your own email address for replies.</p>
+  <p>
+    Let recipients send replies to a shared inbox that's managed by your team.
+  </p>
+  <p>
+    Do not use your own email address for replies.
+  </p>
   {% call form_wrapper() %}
     {{ textbox(
       form.email_address,

From ba51e395f1374a27a0c825c559c1cd5c804df5b8 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Mon, 3 Dec 2018 13:55:54 +0000
Subject: [PATCH 5/5] Fix apostrophe

---
 app/templates/views/service-settings/email-reply-to/add.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/views/service-settings/email-reply-to/add.html b/app/templates/views/service-settings/email-reply-to/add.html
index a0fcd044a..e738d5879 100644
--- a/app/templates/views/service-settings/email-reply-to/add.html
+++ b/app/templates/views/service-settings/email-reply-to/add.html
@@ -14,7 +14,7 @@
     Add email reply-to address
   </h1>
   <p>
-    Let recipients send replies to a shared inbox that's managed by your team.
+    Let recipients send replies to a shared inbox that’s managed by your team.
   </p>
   <p>
     Do not use your own email address for replies.