adapt the EN welcome mail

1 files changed, 46 insertions, 32 deletions

diff --git a/service/pixelated/assets/welcome.mail.en-US b/service/pixelated/assets/welcome.mail.en-US
index 8ef4e120..3d9f7721 100644
--- a/service/pixelated/assets/welcome.mail.en-US
+++ b/service/pixelated/assets/welcome.mail.en-US
@@ -5,23 +5,31 @@ To: Replace <will.be@the.user>
 Content-Type: multipart/alternative; boundary=000boundary000
 
 --000boundary000
-Welcome to Pixelated Mail, a modern email with encryption.
+Content-Type: text/plain; charset=UTF-8
 
-Pixelated Mail is an open source project that aims to provide secure email on the browser with all the functionality we've come to expect of a modern email client.
+Welcome to Pixelated Mail, modern email with encryption.
+
+Pixelated Mail is an open source project that aims to provide secure email in the browser, with all the functionality we've come to expect of modern email clients.
 
 How to use it
-Pixelated Mail should provide functionality that is similar to what you've come to expect of your email software. To the left, you will find a navigation bar that provides access to all your mailboxes and tags. Clicking on them will load the corresponding messages on the middle pane - the mail list. Clicking on a message will load it on this pane, but you know it already!
+-------------
+
+Pixelated Mail does what you've come to expect of your email program. On the left, you will find a navigation bar where you can find your mailboxes and tags. Clicking them will load the corresponding messages in the middle area - the mail list. Clicking on a message will show it on the right side, but you know it already!
 
-To compose a message look for the big blue button on the top left. You can add tags to received messages by clicking on the "+" sign under the message subject. You can also find the encryption status of messages just above the sender/recipient information.
+To compose a message look for the big blue button on the top left. You can add tags to received messages by clicking on the "+" sign below the message subject. You can also find the encryption status of a message just above the sender/recipient information.
 
 A bit more about Pixelated
-Pixelated is an open source project licensed under AGPL 3.0. It is composed of 2 main parts, the User Agent (what you are using right now) and the Platform (which provides the email service you will use to send and receive messages - the server behind the @ sign on your new mail address). You can learn more by visiting https://pixelated-project.org/.
+--------------------------
+
+Pixelated is an open source project licensed under AGPL 3.0. It is composed of 2 main parts, the User Agent (that you are using right now) and the Provider (which will send and receive your emails, the server behind the @ sign on your new mail address). You can learn more by visiting https://pixelated-project.org/.
 
 About this message and encryption status
-This message was not encrypted, in other words, it could have been read by others at some point during transmission, like any other email client.
-To send encrypted messages you have to have the public keys of the recipients, in Pixelated you have 2 options:
-send an email to another Pixelated account: public keys are exchanged by default.
-send an email to another email provider: you should had exchanged public keys with the recipients previously.
+----------------------------------------
+
+This message was not encrypted. Like any email, it could have been read by others before reaching your provider.
+To send encrypted messages you have to have the public keys of the recipients. In Pixelated there are 2 ways to get someone's public key:
+- when you send an email to another account on your provider, the public keys are exchanged by default
+- when you receive an encrypted mail from anyone, their public key will be automatically stored
 
 
 Enjoy your secure messaging!
@@ -29,43 +37,49 @@ Enjoy your secure messaging!
 --000boundary000
 Content-Type: text/html; charset=UTF-8
 Content-Transfer-Encoding: quoted-printable
+
 <p>
-Welcome to Pixelated Mail, a modern email with encryption.
+Welcome to Pixelated Mail, modern email with encryption.
 </p>
 <p>
 Pixelated Mail is an open source project that aims to provide secure email =
-on the browser with all the functionality we've come to expect of a modern =
-email client.
+in the browser, with all the functionality we've come to expect of modern e=
+mail clients.
 </p>
 <p>
-<b>How to use it</b><br>
-Pixelated Mail should provide functionality that is similar to what you've =
-come to expect of your email software. To the left, you will find a navigat=
-ion bar that provides access to all your mailboxes and tags. Clicking on th=
-em will load the corresponding messages on the middle pane - the mail list.=
- Clicking on a message will load it on this pane, but you know it already!
+<b>How to use it</b><br/>
+Pixelated Mail does what you've come to expect of your email program. On th=
+e left, you will find a navigation bar where you can find your mailboxes an=
+d tags. Clicking them will load the corresponding messages in the middle ar=
+ea - the mail list. Clicking on a message will show it on the right side, b=
+ut you know it already!
 </p>
 <p>
 To compose a message look for the big blue button on the top left. You can =
-add tags to received messages by clicking on the "+" sign under the message=
- subject. You can also find the encryption status of messages just above th=
-e sender/recipient information.
+add tags to received messages by clicking on the "+" sign below the message=
+ subject. You can also find the encryption status of a message just above t=
+he sender/recipient information.
 </p>
 <p>
-<b>A bit more about Pixelated</b><br>
+<b>A bit more about Pixelated</b><br/>
 Pixelated is an open source project licensed under AGPL 3.0. It is composed=
- of 2 main parts, the User Agent (what you are using right now) and the Pla=
-tform (which provides the email service you will use to send and receive me=
-ssages - the server behind the @ sign on your new mail address). You can le=
-arn more by visiting <a src=3D"https://pixelated-project.org/">https://pixe=
-lated-project.org/</a>.
+ of 2 main parts, the User Agent (that you are using right now) and the Pro=
+vider (which will send and receive your emails, the server behind the @ sig=
+n on your new mail address). You can learn more by visiting https://pixelat=
+ed-project.org/.
 </p>
 <p>
-<b>About this message and encryption status</b><br>
-This message was not encrypted, in other words, it could have been read by others at some point during transmission like any other email client.
-To send encrypted messages you have to have the public Keys of the recipients, in Pixelated you have 2 options:
-<p>- sending an email to another Pixelated account: public keys are exchanged by default.
-<br>- sending an email to another email provider: you should had exchanged public keys with the recipients previously.
+<b>About this message and encryption status</b><br/>
+This message was not encrypted. Like any email, it could have been read by =
+others before reaching your provider.
+To send encrypted messages you have to have the public keys of the recipien=
+ts. In Pixelated there are 2 ways to get someone's public key:
+<ul>
+<li>when you send an email to another account on your provider, the public =
+keys are exchanged by default</li>
+<li>when you receive an encrypted mail from anyone, their public key will b=
+e automatically stored</li>
+</ul>
 </p>
 <p>
 Enjoy your secure messaging!