From eb3063a57f13f25f56a3e7f828a0f550bb334b3b Mon Sep 17 00:00:00 2001
From: Son NK <son@simplelogin.io>
Date: Sun, 15 Mar 2020 18:06:57 +0100
Subject: [PATCH] Improve wording

---
 .../templates/dashboard/refused_email.html          | 13 ++++++++++++-
 .../transactional/automatic-disable-alias.html      |  2 +-
 .../transactional/automatic-disable-alias.txt       |  2 +-
 templates/emails/transactional/bounced-email.html   |  2 +-
 templates/emails/transactional/bounced-email.txt    |  2 +-
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/app/dashboard/templates/dashboard/refused_email.html b/app/dashboard/templates/dashboard/refused_email.html
index 27b7e8b1..12cdab78 100644
--- a/app/dashboard/templates/dashboard/refused_email.html
+++ b/app/dashboard/templates/dashboard/refused_email.html
@@ -10,6 +10,16 @@
   <div style="max-width: 60em; margin: auto">
     <h1 class="h3 mb-5"> Refused Emails </h1>
 
+    <div class="alert alert-info">
+      This page shows all emails that have been <b>refused</b> (or bounced) by your mailbox. <br>
+      Usually this is because your mailbox thinks these emails are <b>spams</b>. <br>
+      - If a refused email is indeed spam, this means the alias is now in the hands of a spammer,
+      in this case you should <b>disable</b> this alias. <br>
+      - Otherwise, you should create a <b>filter</b> to avoid your email provider from blocking these emails. <br>
+      <a href="mailto:hi@simplelogin.io">Contact us↗</a> if you need any help.
+
+    </div>
+
     {% if fels|length == 0 %}
       <div class="my-4 p-4 card">
         You don't have any refused email.
@@ -30,7 +40,8 @@
         {% if refused_email.deleted %}
           Email deleted {{ refused_email.delete_at | dt }}
         {% else %}
-          <a href="{{ refused_email.get_url() }}" class="mt-4">Download →</a>
+          <a href="{{ refused_email.get_url() }}" download
+             class="mt-4">Download →</a>
           <div class="small-text">This will download a ".eml" file that you can open in your favorite email client</div>
         {% endif %}
 
diff --git a/templates/emails/transactional/automatic-disable-alias.html b/templates/emails/transactional/automatic-disable-alias.html
index fa17c8b9..2a040814 100644
--- a/templates/emails/transactional/automatic-disable-alias.html
+++ b/templates/emails/transactional/automatic-disable-alias.html
@@ -2,7 +2,7 @@
 
 {% block content %}
   {{ render_text("Hi " + name) }}
-  {{ render_text("There are at least 2 emails sent to your alias <b>" + alias + "</b>" +  " (mailbox "+ mailbox_email +  ") from <b>" + website_email + "</b> that have been <b>refused</b> (or bounced) by your email provider.") }}
+  {{ render_text("There are at least 2 emails sent to your alias <b>" + alias + "</b> from <b>" + website_email + "</b> that have been <b>refused</b> (or bounced) by your mailbox " + mailbox_email + ".") }}
 
 
   {{ render_text("This is usually due to the email being considered as <b>spam</b> by your email provider.") }}
diff --git a/templates/emails/transactional/automatic-disable-alias.txt b/templates/emails/transactional/automatic-disable-alias.txt
index 5d03a643..db6a5c21 100644
--- a/templates/emails/transactional/automatic-disable-alias.txt
+++ b/templates/emails/transactional/automatic-disable-alias.txt
@@ -1,6 +1,6 @@
 Hi {{name}}
 
-There are at least 2 emails sent to your alias {{alias}} (mailbox {{mailbox_email}}) from {{website_from}} that have been refused (or bounced) by your email provider.
+There are at least 2 emails sent to your alias {{alias}} from {{website_from}} that have been refused (or bounced) by your mailbox {{mailbox_email}}.
 
 This is usually due to the email being considered as spam by your email provider.
 You can view this email here:
diff --git a/templates/emails/transactional/bounced-email.html b/templates/emails/transactional/bounced-email.html
index 29829b06..41179c62 100644
--- a/templates/emails/transactional/bounced-email.html
+++ b/templates/emails/transactional/bounced-email.html
@@ -2,7 +2,7 @@
 
 {% block content %}
   {{ render_text("Hi " + name) }}
-  {{ render_text("An email sent to your alias <b>" + alias + "</b>" +  " (mailbox "+ mailbox_email +  ") from <b>" + website_email + "</b> was <b>refused</b> (or bounced) by your email provider.") }}
+  {{ render_text("An email sent to your alias <b>" + alias + "</b> from <b>" + website_email + "</b> was <b>refused</b> (or bounced) by your mailbox " + mailbox_email + ".") }}
 
   {{ render_text('This is usually due to the email being considered as <b>spam</b> by your email provider.') }}
 
diff --git a/templates/emails/transactional/bounced-email.txt b/templates/emails/transactional/bounced-email.txt
index e8625b3e..c47ca855 100644
--- a/templates/emails/transactional/bounced-email.txt
+++ b/templates/emails/transactional/bounced-email.txt
@@ -1,6 +1,6 @@
 Hi {{name}}
 
-An email sent to your alias {{alias}} (mailbox {{mailbox_email}}) from {{website_from}} was refused (or bounced) by your email provider.
+An email sent to your alias {{alias}} from {{website_from}} was refused (or bounced) by your mailbox {{mailbox_email}}.
 
 This is usually due to the email being considered as spam by your email provider.
 You can view this email here: