From 398efd68cda87738b9e3deeb0ef7c155b9a2f6dc Mon Sep 17 00:00:00 2001
From: Deni Cho <dencho.12@gmail.com>
Date: Tue, 3 Apr 2018 17:09:42 +0700
Subject: [PATCH 1/4] =?UTF-8?q?Changed=20email=20wording=20from=20?=
 =?UTF-8?q?=E2=80=98mute=E2=80=99=20to=20=E2=80=98unsubscribe=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 email-templates/newThreadNotification.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/email-templates/newThreadNotification.html b/email-templates/newThreadNotification.html
index e464360fac..d32515d86b 100644
--- a/email-templates/newThreadNotification.html
+++ b/email-templates/newThreadNotification.html
@@ -482,18 +482,18 @@ <h3>{{data.thread.content.title}}</h3>
                 <ul>
                   {{#muteChannelToken}}
                     <li>
-                      <a href="https://spectrum.chat/api/email/unsubscribe?token={{.}}">Mute the {{../data.thread.channel.name}} channel in {{../data.thread.community.name}}</a>
+                      <a href="https://spectrum.chat/api/email/unsubscribe?token={{.}}">Unsubscribe the {{../data.thread.channel.name}} channel in {{../data.thread.community.name}}</a>
                     </li>
                   {{/muteChannelToken}}
 
                   {{#muteCommunityToken}}
                     <li>
-                      <a href="https://spectrum.chat/api/email/unsubscribe?token={{.}}">Mute the {{../data.thread.community.name}} community</a>
+                      <a href="https://spectrum.chat/api/email/unsubscribe?token={{.}}">Unsubscribe the {{../data.thread.community.name}} community</a>
                     </li>
                   {{/muteCommunityToken}}
 
                   <li>
-                    <a href="https://spectrum.chat/api/email/unsubscribe?token={{unsubscribeToken}}">Mute all new thread notification emails</a>
+                    <a href="https://spectrum.chat/api/email/unsubscribe?token={{unsubscribeToken}}">Unsubscribe all new thread notification emails</a>
                   </li>
 
                   {{#recipient.username}}

From 15d1d26d9df8c3b16a84b71383f823c8c285ab17 Mon Sep 17 00:00:00 2001
From: Deni Cho <dencho.12@gmail.com>
Date: Tue, 3 Apr 2018 17:14:49 +0700
Subject: [PATCH 2/4] Added more changes in wording

---
 email-templates/mentionInMessage.html    | 2 +-
 email-templates/mentionInThread.html     | 2 +-
 email-templates/newDirectMessage.html    | 4 ++--
 email-templates/newRepliesInThreads.html | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/email-templates/mentionInMessage.html b/email-templates/mentionInMessage.html
index f70a0576d0..a7ff625a28 100644
--- a/email-templates/mentionInMessage.html
+++ b/email-templates/mentionInMessage.html
@@ -508,7 +508,7 @@ <h3>{{data.thread.content.title}}</h3>
                 <ul>
                   {{#muteThreadToken}}
                     <li>
-                      <a href="https://spectrum.chat/api/email/unsubscribe?token={{.}}">Mute this thread by {{../data.thread.creator.name}} (including future @mentions)</a>
+                      <a href="https://spectrum.chat/api/email/unsubscribe?token={{.}}">Unsubscribe this thread by {{../data.thread.creator.name}} (including future @mentions)</a>
                     </li>
                   {{/muteThreadToken}}
 
diff --git a/email-templates/mentionInThread.html b/email-templates/mentionInThread.html
index 3bedc0fa4e..1fec401c4b 100644
--- a/email-templates/mentionInThread.html
+++ b/email-templates/mentionInThread.html
@@ -482,7 +482,7 @@ <h3>{{data.thread.content.title}}</h3>
                 <ul>
                   {{#muteThreadToken}}
                     <li>
-                      <a href="https://spectrum.chat/api/email/unsubscribe?token={{.}}">Mute this thread by {{../data.thread.creator.name}} (including future @mentions)</a>
+                      <a href="https://spectrum.chat/api/email/unsubscribe?token={{.}}">Unsubscribe this thread by {{../data.thread.creator.name}} (including future @mentions)</a>
                     </li>
                   {{/muteThreadToken}}
 
diff --git a/email-templates/newDirectMessage.html b/email-templates/newDirectMessage.html
index 4a04973cb5..ddaa8ce4e2 100644
--- a/email-templates/newDirectMessage.html
+++ b/email-templates/newDirectMessage.html
@@ -480,12 +480,12 @@
                 <ul>
                   {{#muteThreadToken}}
                     <li>
-                      <a href="https://spectrum.chat/api/email/unsubscribe?token={{.}}">Mute this conversation</a>
+                      <a href="https://spectrum.chat/api/email/unsubscribe?token={{.}}">Unsubscribe this conversation</a>
                     </li>
                   {{/muteThreadToken}}
 
                   <li>
-                    <a href="https://spectrum.chat/api/email/unsubscribe?token={{unsubscribeToken}}">Mute all new direct message notification emails</a>
+                    <a href="https://spectrum.chat/api/email/unsubscribe?token={{unsubscribeToken}}">Unsubscribe all new direct message notification emails</a>
                   </li>
 
                   {{#username}}
diff --git a/email-templates/newRepliesInThreads.html b/email-templates/newRepliesInThreads.html
index b29190228f..36a36931af 100644
--- a/email-templates/newRepliesInThreads.html
+++ b/email-templates/newRepliesInThreads.html
@@ -576,7 +576,7 @@ <h3>{{content.title}}</h3>
                 <ul>
                   {{#singleThreadMuteToken}}
                     <li>
-                      <a href="https://spectrum.chat/api/email/unsubscribe?token={{.}}">Mute this thread (including future @mentions)</a>
+                      <a href="https://spectrum.chat/api/email/unsubscribe?token={{.}}">Unsubscribe this thread (including future @mentions)</a>
                     </li>
                   {{/singleThreadMuteToken}}
 

From e2b0603b1f44d79047f860dda9dc4f95bf227038 Mon Sep 17 00:00:00 2001
From: Deni Cho <dencho.12@gmail.com>
Date: Tue, 3 Apr 2018 18:55:54 +0700
Subject: [PATCH 3/4] Updated to make it less weird

---
 email-templates/mentionInMessage.html      | 2 +-
 email-templates/mentionInThread.html       | 2 +-
 email-templates/newDirectMessage.html      | 4 ++--
 email-templates/newRepliesInThreads.html   | 2 +-
 email-templates/newThreadNotification.html | 6 +++---
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/email-templates/mentionInMessage.html b/email-templates/mentionInMessage.html
index a7ff625a28..a015acca32 100644
--- a/email-templates/mentionInMessage.html
+++ b/email-templates/mentionInMessage.html
@@ -508,7 +508,7 @@ <h3>{{data.thread.content.title}}</h3>
                 <ul>
                   {{#muteThreadToken}}
                     <li>
-                      <a href="https://spectrum.chat/api/email/unsubscribe?token={{.}}">Unsubscribe this thread by {{../data.thread.creator.name}} (including future @mentions)</a>
+                      <a href="https://spectrum.chat/api/email/unsubscribe?token={{.}}">Unsubscribe from this thread by {{../data.thread.creator.name}} (including future @mentions)</a>
                     </li>
                   {{/muteThreadToken}}
 
diff --git a/email-templates/mentionInThread.html b/email-templates/mentionInThread.html
index 1fec401c4b..d59ef8ba38 100644
--- a/email-templates/mentionInThread.html
+++ b/email-templates/mentionInThread.html
@@ -482,7 +482,7 @@ <h3>{{data.thread.content.title}}</h3>
                 <ul>
                   {{#muteThreadToken}}
                     <li>
-                      <a href="https://spectrum.chat/api/email/unsubscribe?token={{.}}">Unsubscribe this thread by {{../data.thread.creator.name}} (including future @mentions)</a>
+                      <a href="https://spectrum.chat/api/email/unsubscribe?token={{.}}">Unsubscribe from this thread by {{../data.thread.creator.name}} (including future @mentions)</a>
                     </li>
                   {{/muteThreadToken}}
 
diff --git a/email-templates/newDirectMessage.html b/email-templates/newDirectMessage.html
index ddaa8ce4e2..3270b93d76 100644
--- a/email-templates/newDirectMessage.html
+++ b/email-templates/newDirectMessage.html
@@ -480,12 +480,12 @@
                 <ul>
                   {{#muteThreadToken}}
                     <li>
-                      <a href="https://spectrum.chat/api/email/unsubscribe?token={{.}}">Unsubscribe this conversation</a>
+                      <a href="https://spectrum.chat/api/email/unsubscribe?token={{.}}">Unsubscribe from this conversation</a>
                     </li>
                   {{/muteThreadToken}}
 
                   <li>
-                    <a href="https://spectrum.chat/api/email/unsubscribe?token={{unsubscribeToken}}">Unsubscribe all new direct message notification emails</a>
+                    <a href="https://spectrum.chat/api/email/unsubscribe?token={{unsubscribeToken}}">Unsubscribe from all new direct message notification emails</a>
                   </li>
 
                   {{#username}}
diff --git a/email-templates/newRepliesInThreads.html b/email-templates/newRepliesInThreads.html
index 36a36931af..05ac6f202c 100644
--- a/email-templates/newRepliesInThreads.html
+++ b/email-templates/newRepliesInThreads.html
@@ -576,7 +576,7 @@ <h3>{{content.title}}</h3>
                 <ul>
                   {{#singleThreadMuteToken}}
                     <li>
-                      <a href="https://spectrum.chat/api/email/unsubscribe?token={{.}}">Unsubscribe this thread (including future @mentions)</a>
+                      <a href="https://spectrum.chat/api/email/unsubscribe?token={{.}}">Unsubscribe from this thread (including future @mentions)</a>
                     </li>
                   {{/singleThreadMuteToken}}
 
diff --git a/email-templates/newThreadNotification.html b/email-templates/newThreadNotification.html
index d32515d86b..bc0158607c 100644
--- a/email-templates/newThreadNotification.html
+++ b/email-templates/newThreadNotification.html
@@ -482,18 +482,18 @@ <h3>{{data.thread.content.title}}</h3>
                 <ul>
                   {{#muteChannelToken}}
                     <li>
-                      <a href="https://spectrum.chat/api/email/unsubscribe?token={{.}}">Unsubscribe the {{../data.thread.channel.name}} channel in {{../data.thread.community.name}}</a>
+                      <a href="https://spectrum.chat/api/email/unsubscribe?token={{.}}">Unsubscribe from the {{../data.thread.channel.name}} channel in {{../data.thread.community.name}}</a>
                     </li>
                   {{/muteChannelToken}}
 
                   {{#muteCommunityToken}}
                     <li>
-                      <a href="https://spectrum.chat/api/email/unsubscribe?token={{.}}">Unsubscribe the {{../data.thread.community.name}} community</a>
+                      <a href="https://spectrum.chat/api/email/unsubscribe?token={{.}}">Unsubscribe from the {{../data.thread.community.name}} community</a>
                     </li>
                   {{/muteCommunityToken}}
 
                   <li>
-                    <a href="https://spectrum.chat/api/email/unsubscribe?token={{unsubscribeToken}}">Unsubscribe all new thread notification emails</a>
+                    <a href="https://spectrum.chat/api/email/unsubscribe?token={{unsubscribeToken}}">Unsubscribe from all new thread notification emails</a>
                   </li>
 
                   {{#recipient.username}}

From f7b3ef1370d2ef9a2c4d3658298e1517dd79e7c1 Mon Sep 17 00:00:00 2001
From: Deni Cho <dencho.12@gmail.com>
Date: Wed, 4 Apr 2018 23:10:02 +0700
Subject: [PATCH 4/4] Updating for better language consistency

---
 email-templates/mentionInMessage.html    | 2 +-
 email-templates/mentionInThread.html     | 2 +-
 email-templates/newRepliesInThreads.html | 2 +-
 email-templates/weeklyDigest.html        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/email-templates/mentionInMessage.html b/email-templates/mentionInMessage.html
index a015acca32..489c712e0a 100644
--- a/email-templates/mentionInMessage.html
+++ b/email-templates/mentionInMessage.html
@@ -513,7 +513,7 @@ <h3>{{data.thread.content.title}}</h3>
                   {{/muteThreadToken}}
 
                   <li>
-                    <a href="https://spectrum.chat/api/email/unsubscribe?token={{unsubscribeToken}}">Don't email me when I'm @mentioned on Spectrum</a>
+                    <a href="https://spectrum.chat/api/email/unsubscribe?token={{unsubscribeToken}}">Unsubscribe from all @mention notifications</a>
                   </li>
 
                   {{#recipient.username}}
diff --git a/email-templates/mentionInThread.html b/email-templates/mentionInThread.html
index d59ef8ba38..e181199315 100644
--- a/email-templates/mentionInThread.html
+++ b/email-templates/mentionInThread.html
@@ -487,7 +487,7 @@ <h3>{{data.thread.content.title}}</h3>
                   {{/muteThreadToken}}
 
                   <li>
-                    <a href="https://spectrum.chat/api/email/unsubscribe?token={{unsubscribeToken}}">Don't email me when I'm @mentioned on Spectrum</a>
+                    <a href="https://spectrum.chat/api/email/unsubscribe?token={{unsubscribeToken}}">Unsubscribe from all @mention notifications</a>
                   </li>
 
                   {{#recipient.username}}
diff --git a/email-templates/newRepliesInThreads.html b/email-templates/newRepliesInThreads.html
index 05ac6f202c..9079f5bedc 100644
--- a/email-templates/newRepliesInThreads.html
+++ b/email-templates/newRepliesInThreads.html
@@ -581,7 +581,7 @@ <h3>{{content.title}}</h3>
                   {{/singleThreadMuteToken}}
 
                   <li>
-                    <a href="https://spectrum.chat/api/email/unsubscribe?token={{unsubscribeToken}}">Don't email me when new replies happen in conversations where I'm active</a>
+                    <a href="https://spectrum.chat/api/email/unsubscribe?token={{unsubscribeToken}}">Unsubscribe from all new reply notifications in conversations where I'm active</a>
                   </li>
 
                   {{#recipient.username}}
diff --git a/email-templates/weeklyDigest.html b/email-templates/weeklyDigest.html
index 8c8ac51744..859c08fcd0 100644
--- a/email-templates/weeklyDigest.html
+++ b/email-templates/weeklyDigest.html
@@ -494,7 +494,7 @@ <h2 class="discover-divider">Discover more communities:</h2>
 
                 <ul>
                   <li>
-                    <a href="https://spectrum.chat/api/email/unsubscribe?token={{unsubscribeToken}}">Turn off {{data.timeframe.subject}} digests</a>
+                    <a href="https://spectrum.chat/api/email/unsubscribe?token={{unsubscribeToken}}">Unsubscribe from {{data.timeframe.subject}} digests</a>
                   </li>
 
                   {{#data.username}}