From 885162c2d2c1c80d8ec209c09464df2681fc81e4 Mon Sep 17 00:00:00 2001
From: Sofiya Semenova <ssemenova@edx.org>
Date: Tue, 21 Nov 2017 16:43:20 -0500
Subject: [PATCH 1/2] Follow-up to email template for forum notifications after
 testing in stage

---
 .../discussion/edx_ace/responsenotification/email/body.html   | 2 +-
 .../discussion/edx_ace/responsenotification/email/body.txt    | 2 +-
 .../discussion/edx_ace/responsenotification/email/subject.txt | 4 +---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/lms/djangoapps/discussion/templates/discussion/edx_ace/responsenotification/email/body.html b/lms/djangoapps/discussion/templates/discussion/edx_ace/responsenotification/email/body.html
index e489400de5..31b4fd5980 100644
--- a/lms/djangoapps/discussion/templates/discussion/edx_ace/responsenotification/email/body.html
+++ b/lms/djangoapps/discussion/templates/discussion/edx_ace/responsenotification/email/body.html
@@ -8,7 +8,7 @@
         <td>
             <p>
                 {% blocktrans trimmed %}
-                    {{ comment_username }} replied to your <b>{{ thread_title }}</b> post
+                    {{ comment_username }} replied to <b>{{ thread_title }}</b>:
                 {% endblocktrans %}
             </p>
 
diff --git a/lms/djangoapps/discussion/templates/discussion/edx_ace/responsenotification/email/body.txt b/lms/djangoapps/discussion/templates/discussion/edx_ace/responsenotification/email/body.txt
index efacbd502a..2207542539 100644
--- a/lms/djangoapps/discussion/templates/discussion/edx_ace/responsenotification/email/body.txt
+++ b/lms/djangoapps/discussion/templates/discussion/edx_ace/responsenotification/email/body.txt
@@ -2,7 +2,7 @@
 
 {% block content %}
 {% blocktrans trimmed %}
-    {{ comment_username }} replied to your <b>{{ thread_title }}</b> post
+    {{ comment_username }} replied to <b>{{ thread_title }}</b>:
 {% endblocktrans %}
 
 {{ comment_body }}
diff --git a/lms/djangoapps/discussion/templates/discussion/edx_ace/responsenotification/email/subject.txt b/lms/djangoapps/discussion/templates/discussion/edx_ace/responsenotification/email/subject.txt
index d94036f97b..a49eb5dec1 100644
--- a/lms/djangoapps/discussion/templates/discussion/edx_ace/responsenotification/email/subject.txt
+++ b/lms/djangoapps/discussion/templates/discussion/edx_ace/responsenotification/email/subject.txt
@@ -1,5 +1,3 @@
 {% load i18n %}
 
-{% blocktrans trimmed %}
-    Response to your {{ thread_title }} post
-{% endblocktrans %}
\ No newline at end of file
+{% blocktrans %}Response to {{ thread_title }}{% endblocktrans %}
\ No newline at end of file

From 1ef5cf9f7af81da0ebd6a09393160979e6153998 Mon Sep 17 00:00:00 2001
From: Sofiya Semenova <ssemenova@edx.org>
Date: Tue, 28 Nov 2017 15:16:11 -0500
Subject: [PATCH 2/2] Preformatted styling for post content

---
 .../edx_ace/responsenotification/email/body.html         | 9 ++++-----
 .../edx_ace/responsenotification/email/body.txt          | 8 +++++++-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/lms/djangoapps/discussion/templates/discussion/edx_ace/responsenotification/email/body.html b/lms/djangoapps/discussion/templates/discussion/edx_ace/responsenotification/email/body.html
index 31b4fd5980..5aedd82535 100644
--- a/lms/djangoapps/discussion/templates/discussion/edx_ace/responsenotification/email/body.html
+++ b/lms/djangoapps/discussion/templates/discussion/edx_ace/responsenotification/email/body.html
@@ -11,11 +11,10 @@
                     {{ comment_username }} replied to <b>{{ thread_title }}</b>:
                 {% endblocktrans %}
             </p>
-
-            <div style="border: 1px solid white;
-                        padding: 15px 15px 15px 20px;
-                        box-shadow: 0 0px 2px rgba(0, 0, 0, 0.55);
-                        margin: 30px 70px 40px 0px;">
+            <div style="border-left: 1px solid rgba(0,0,0,0.25);
+                    padding: 1px 1px 1px 15px;
+                    margin: 20px 20px 30px 30px;
+                    color: rgba(0,0,0,.75);">
                 {{ comment_body }}
             </div>
 
diff --git a/lms/djangoapps/discussion/templates/discussion/edx_ace/responsenotification/email/body.txt b/lms/djangoapps/discussion/templates/discussion/edx_ace/responsenotification/email/body.txt
index 2207542539..2cd496a6b6 100644
--- a/lms/djangoapps/discussion/templates/discussion/edx_ace/responsenotification/email/body.txt
+++ b/lms/djangoapps/discussion/templates/discussion/edx_ace/responsenotification/email/body.txt
@@ -5,7 +5,13 @@
     {{ comment_username }} replied to <b>{{ thread_title }}</b>:
 {% endblocktrans %}
 
-{{ comment_body }}
+
+<div style="border-left: 1px solid rgba(0,0,0,0.25);
+                    padding: 1px 1px 1px 15px;
+                    margin: 20px 20px 30px 30px;
+                    color: rgba(0,0,0,.75);">
+    {{ comment_body }}
+</div>
 
 <a href="{{ post_link }}"> {% trans "View discussion" %} </a>
 {% endblock %}