Update on Settings section. Fixed texts and images.

pages/02.tutorials/03.Email/03.Webmail/Roundcube/02.settings/01.preferences/docs.en.md

@@ -15,8 +15,6 @@ page-toc:
 
 # Settings
 
-![Settings](../settings.png)
-
 ## Preferences
 
 ![Preferences](en/set_preferences.png)

pages/02.tutorials/03.Email/03.Webmail/Roundcube/02.settings/02.folders/docs.en.md

@@ -15,8 +15,45 @@ page-toc:
 
 # Settings
 
-![Settings](../settings.png)
-
 ## Folders
+Here are the settings that allows you to manage the mailbox folders.
 
 ![Folders](en/set_folders.png)
+
+By selecting one you will see in the right pane, information regarding location of the folder, viewing options, when a message is old and how many there are currently. In the mailbox default folders, only the display mode and the age of the mails can be changed.
+
+![Folders](en/folder_properties.png)
+
+In the folder list, the right column indicates whether a folder is subscribed or not. By clicking on the on/off button you can change the subscription for that folder.
+
+![Folders](en/subscribe_btn.gif)
+
+Subscribed folders are displayed in the email view while unsubscribed ones are hidden and only visible here.
+
+### Creating a folder
+
+To create a folder:
+
+01. Click on the **Create** folder button.
+
+  ![Folders](en/folder_buttons.png)
+
+02. Enter a name for the folder.
+03. Select or create a parent folder (the **Parent folder** field is already pre-selected whith the folder currently selected in the folder list)
+
+  ![Folders](en/folder_create.png)
+
+04. Select the display mode and set when messages should be deleted.
+
+05. Click **Save** to finish.
+
+  ![Folders](en/folder_created.png)
+
+### Folders hierarchy
+To maintain a certain order, you can create folders or hierarchical folder structures.
+
+To move a folder simply drag & drop it from the list onto the desired parent folder.
+
+![Folders](en/moving.gif)
+
+You can also select the parent folder in the property form in the right and by hitting Save the currently selected folder is moved to its new parent.

pages/02.tutorials/03.Email/03.Webmail/Roundcube/02.settings/03.identities/docs.en.md

@@ -15,58 +15,68 @@ page-toc:
 
 # Settings
 
-![Settings](../settings.png)
-
 ## Identities
 
 ![Identities](en/set_identities.png)
 
 ### Default identity
-Your identity is how to will be seen as sender when you send out email messages.
+Your identity is the name and email address displayed on the recipient's mailbox when you send an email.
 
 To access it, click on **Settings** and then **Identities**.
 
-![Identities](en/identities.png)
+![Identities](en/settings_identities.png)
 
-You will see your default identity, here the *testuser@disroot.org* identity.
+You will see your default identity (*testuser@disroot.org* in this example).
 If you click on it, you will have access to some settings.
 
+![Identities](en/identities.png)
+
 - **Display name**: the full name displayed in the recipient’s email program when you send out a message. It can be anything you want.
 
-- **Email**: **Don't change this for your default email**. It has to be your username@disroot.org email address. Otherwise message sending might fail because of an invalid sender address.
+- **Email**: your default **Disroot** email address. **Don't change it** otherwise message sending might fail because of an invalid sender address.
 
-- **Organization**: Optionnal, some email programs display the organization field when receiving messages from you with this filled out.
+- **Organization**: This is optional. If you add this information, some email programs may display it when receiving messages from you.
 
-- **Reply-to**: Optionnal, enter an email address that differs from the identity’s Email address here in order to force recipients to send answers to that address instead of the sender email address.
+- **Reply-to**: This is optional. If you want the recipient to reply to a different email address than the one you sent a message to, then type it here.
 
-- **Bcc**: Optionnal, specify an email address here that will receive blind copies of every message you send with this identity.
+- **Bcc**: This is optional. If you want an email address to receive a blind copy of all the messages you send with this identity, enter it here.
 
-- **Set default**: check this box to make the current identity the default selection when writing new messages. You can still chose another sender identity while composing a message, though.
+- **Set default**: Make the current identity the default selection when writing new messages. However, you can still choose another sender identity when composing a message.
 
-You can also add a signature that will be inserted to the bottom of the message you write. Visit **Settings > Preferences > Composing Messages** to configure when and how signatures are inserted.
+You can also create a signature by using the editor. Click on the edit mode selector in the upper left corner of the box and start composing it. This signature will be inserted to the bottom of the message you write.
 
+![Identities](en/signature.gif)
 
-#### Add other identities / aliases
-You can set up an alias to your email.
-By default, all Disrooters have two email aliases: *username@disr.it* and *username@getgoogleoff.me*. But you can add more aliases if you want. Check [here](https://disroot.org/en/services/email#alias) to know more about how to have aliases.
+Visit **Settings > Preferences > Composing Messages** to configure when and how signatures signatures are inserted.
+
+![Identities](../01.preferences/en/pref_composing.png)
+
+### Creating identities / aliases
+Here you can set up an alias to your email.
+
+An email alias is just a forwarding address. All the messages sent to this alias are forwarded to your email account. This alias does not necessarily exist, has no inbox or login credentials, and it is a very useful tool to manage your emails more efficiently. For example, you may need to share an email address without exposing your personal one or if you are on a mailing list and need to organized the emails related to it.
+
+By default, all Disrooters have two email aliases: *username@disr.it* and *username@getgoogleoff.me*.<br> *To add more aliases, please check [here](https://disroot.org/en/services/email#alias) to learn more about it.*
 
 To add an alias / identity, click on **Create**.
 
 ![Identities](en/identities_new.png)
 
-1. **Display name**: set it as you wish.
+1. **Display name**: Here you must enter a name to identify the alias.
 
-2. **Email**: set the alias you want, so for example *username@disr.it* or *username@getgoogleoff.me* or what ever valide alias yuu donated for.
+2. **Email**: Set the alias of your choice, for example *username@disr.it* or *username@getgoogleoff.me* or whatever valid alias you donated for.
 
-3. **Save**: pretty obvious.
+- **Organization**, **Reply To**, **Bcc**, **Set default** and **Signature** options we have already seen them.
+
+3. **Save**: Do not forget to save your changes.
 
 4. Once saved, your identities appear here.
 
 
-#### Sending an email with another identity
+### Sending an email with another identity
 To change your identity when you compose your email:
 
-![Identities](en/identities_send.png)
+![Identities](en/select_id.gif)
 
 1. Click on the **From** field. You will have access to all the identities you set.
 

pages/02.tutorials/03.Email/03.Webmail/Roundcube/02.settings/04.responses/docs.en.md

@@ -14,29 +14,39 @@ page-toc:
 
 # Settings
 
-![Settings](../settings.png)
-
 ## Responses
 
-![Responses](en/set_responses.png)
-
 This option allows you to save responses, which can be handy when repeatedly writing emails with the same text.
 
 **Note**: these are only text snippets that can be inserted anywhere and not message templates with subject, text or attachments.
 
-To add or insert a response to your email, go on **Compose** and click on **Responses** button in the top bar.
+![Responses](en/set_responses.png)
 
-![Responses](en/responses.png)
+### Creating a Response
+There are two ways of creating a Response.
 
-You then have three options:
-- **Insert a response**: the list of your responses appears it. Just click on it to insert it your email.
+01. First one is to create a response from **Responses** option in the **Settings** by clicking the **Create** button.
 
-- **Create a new response**: give it a name, add your text and save it.
+![Responses](en/create.gif)
 
-![Responses](en/responses_new.png)
-
-- **Edit responses**: clicking on this option will get you to the **Settings**, in the **Responses** section.
+Enter a name to identify your response, the text and finally **Save**.
 
 ![Responses](en/responses_edit.png)
 
-From there you can change your responses: their names, their contents, delete them, add new ones.
+You can also edit your responses from here: their names, their contents, delete them, add new ones.
+
+02. The second way to create a response while composing an email.
+
+Go to **Compose** and click on **Responses** button in the top bar to add or insert a response to your email.
+
+![Responses](en/responses.png)
+
+You have three options here:
+
+- **Insert a response**: If you have one or more responses set up, they will appear here. Just click on it to insert it your email.
+
+- **Create a new response**: Click on this option to create one. The creation box will open, enter a name and text of your response and save it.
+
+  ![Responses](en/responses_new.png)
+
+- **Edit responses**: Clicking on this option will get you to the **Settings**, in the **Responses** section where you can edit the responses.

pages/02.tutorials/03.Email/03.Webmail/Roundcube/02.settings/05.filters/docs.en.md

@@ -15,32 +15,33 @@ page-toc:
 
 # Settings
 
-![Settings](../settings.png)
-
 ## Filters
+An email filter is a set of rules that are applied to the incoming mail. Depending on whether or not the emails comply with these rules, the email client will execute an action on them, such as forwarding certain emails to a specific folder.
+
+So, with filters you can specify conditions to match and actions to take on matching, for example, move emails from a sender to a particular folder. Basically, you tell the mailserver how it should process your mails.
 
 ![Filters](en/set_filters.png)
 
-WIth filters, you can specify conditions to match and actions to take on matching, for example move emails from a sender to a specifiy folder. Basically, you tell the mailserver how it should process your mails.
-
 To manage/create filters, go to the **Settings** and click on **Filters**
 
 ![Filters](en/filters.png)
 
-1. Choose **managesieve** to list your existing filter rules. Click on **Create** to create a new filter
+1. Choose **rainloop.user** to list your existing filter rules. Click on **Create** to create a new filter
 
-2. **Filter name**: give a name to your filter rule.
+2. **Filter name**: Enter the name of your filter rules.
 
-3. **Filter enabled**: enable / disable your filter rule.
+3. **Filter enabled**: Enable / Disable the filter rule.
 
-4. **Scope**: choose how will your filter work. You can add multiple rules to your filter. You can choose *matching all of the following rules*, which means that your filter applies only when it matches all your filter rules. For example if you have rule 1 and rule 2, then your filter will apply if rule 1 AND rule 2 conditions are met. Upu can choose *matching any of the following rules* which means that your filter applies if at least one of the conditions is met, so rule 1 OR rule 2. You can also choose *all messages* which applies to all emails.
+4. **Scope**: Choose how your filter will work. You can add multiple rules to your filter. You can choose:
+    - **matching all of the following rules**, which means that your filter applies only when it matches all your filter rules. For example, if you have *rule 1* and *rule 2*, then your filter will apply if *rule 1* **AND** *rule 2* conditions are met; or
+    - **matching any of the following rules**, which means that your filter applies if at least one of the conditions is met, so *rule 1* **OR** *rule 2*. You can also choose *all messages* which applies to all emails.
 
-5. **Rules**: that is where you set the conditions of your filter. There are a lot of possibilities: action according to the subject of an email, to its sender, to its size, etc. Click on the **+** sign to add more than one rule.
+5. **Rules**: Here is where you set the conditions of your filter. There are a lot of possibilities: action according to the subject of an email, to its sender, to its size, etc. Click on the **+** sign to add more than one rule.
 
-6. **Actions**: that is where you decide what actions will be taken if the rules you set are met. There are a lot of possibilities: reply with a message, move an email to a folder, delete a message, etc.  Click on the **+** sign to add more than one action.
+6. **Actions**: Set the actions to be taken when the conditions are met. There are a lot of possibilities: reply with a message, move an email to a folder, delete a message, etc.  Click on the **+** sign to add more than one action.
 
-7. **Save**: don't forget to click on the **Save** button when you pleased with your filter setting.
+7. **Save**: Do not forget to click on the **Save** button when you pleased with your filter setting.
 
-Following is an example of a filter that will search for the word *support* in the subject field of each email received, and send an automatic answer that the receiver is on vacation to all people asking questions about support!
+Following is an example of a filter that will search for the word *support* in the subject field of each email received, and send an automatic answer that the receiver is on vacation to all people asking questions about support.
 
 ![Filters](en/filters_example.png)

pages/02.tutorials/03.Email/03.Webmail/Roundcube/02.settings/06.account_details/docs.en.md

@@ -14,8 +14,14 @@ page-toc:
 
 # Settings
 
-![Settings](../settings.png)
-
 ## Account details
 
 ![Account details](en/set_account.png)
+
+Here you will find information about:
+  - Your email user
+  - Your system
+  - Your mailbox
+  - Roundcube version
+
+You will also find a donate button if you want to contribute to **Roundcube Project**.

pages/02.tutorials/03.Email/03.Webmail/Roundcube/02.settings/07.2fa/docs.en.md

@@ -15,14 +15,20 @@ page-toc:
 
 # Settings
 
-![Settings](../settings.png)
-
 ## Two Factor Authentication
+Two-factor authentication (2FA) is a security process that has a two steps verification, usually, the combination of two factors:
+1. something you know (like a password),
+2. something you have (could be a security token, a card, a QR code, etc.), or
+3. something you are (like your fingerprint).
+
+For example, extracting money from an ATM requires you to use your bank card (something you have) and a PIN (something you know). If the combination fails, you can't extract the money.
+
+Two-factor authentication can be used if you want have a more secure login (you can read more about it [here](https://en.wikipedia.org/wiki/Multi-factor_authentication)). When enabled, you will be asked not only for your login name and password, but also for an extra authentication like an one-time-password (OTP) provided by an app (for example [Aegis](https://f-droid.org/en/packages/com.beemdevelopment.aegis/), [FreeOTP](https://f-droid.org/en/packages/org.fedorahosted.freeotp/), [andOTP](https://f-droid.org/en/packages/org.shadowice.flocke.andotp/)) or verification via a hardware device.
+
 
 ![Two Factor Authentication](en/set_2fa.png)
 
 ### Activate Two Factor Authentication
-Two-factor authentication (2FA) adds a second level of authentication to an account log-in. 2FA requires the user to have not only his/her username and password, but also a code provided by an app (for example [Aegis](https://f-droid.org/en/packages/com.beemdevelopment.aegis/), [FreeOTP](https://f-droid.org/en/packages/org.fedorahosted.freeotp/), [andOTP](https://f-droid.org/en/packages/org.shadowice.flocke.andotp/))
 
 To add 2FA on your webmail access:
 
@@ -34,7 +40,7 @@ To add 2FA on your webmail access:
 
 3. Click on **Fill all fields...**
 
-An information window will popup. As explained, you need a 2FA app either installed on your smartphone or on your computer to scan the provided QR-code and test the obtained code to make sure everything is set up correctly.
+An information window will popup. As we mentioned, you need a 2FA app either installed on your mobile or on your computer to scan the provided QR-code and test the obtained code to make sure everything is set up correctly.
 
 ![2fa access](en/2fa_popup.png)
 
@@ -42,25 +48,27 @@ All fields will automatically be filled:
 
 ![2fa save](en/2fa_save.png)
 
-1. **Activiate**: check/uncheck this box if you want to enable / disable 2FA authentication
+1. **Activiate**: Check/uncheck this box to enable / disable 2-F Authentication
 
-2. **Secret**: this is the code you may have to provide to your 2FA app if you can't use QR-code. Also called *2FA token*.
+2. **Secret**: This is the code you may have to provide to your 2FA app if you can't use QR-code. Also called *2FA token*.
 
-3. **Recovery codes**: save those in your password manager! If you lose access to your mobile device or to the authenticator app on your device, the recovery code is your last resort to deactivate two-factor authentication. The recovery code allows you to login again with your email and password.
+3. **Recovery codes**: Save these codes in your password manager or somewhere safe! If you lose access to your mobile or to the authenticator app on your device, the recovery code is your last resort to deactivate 2FA. The recovery code allows you to login again with your email and password.
 
-4. **QR-code**: launch your 2FA app and scan this QR-code to set up your webmail 2FA code. When you're done, your app provides you with a code that changes every X seconds. This is the code you will need to log in.
+4. **QR-code**: Launch your 2FA app and scan this QR-code to set up your webmail 2FA code. When you're done, your app provides you with a code that changes every X seconds. This is the code you will need to log in.
 
-5. **Check code**: the first time you set 2FA on your webmail account, you need to enter the code you get from the 2FA app you use to make sure everything is set up properly. So just enter the code you get here, and click on **Check code**. If everything is fine, you'll get a pop-up window that says **Code OK**.
+5. **Check code**: The first time you set 2FA on your webmail account, you need to enter the code you get from the 2FA app you use to make sure everything is set up properly. So just enter the code you get here, and click on **Check code**. If everything is fine, you'll get a pop-up window that says **Code OK**.
 
-![2fa ok](en/2fa_ok.png)
+  ![2fa ok](en/2fa_ok.png)
 
-6. **Save**: once the code is checked and is OK, you can save. Now 2FA is enabled on your webmail account.
+6. **Save**: Once the code is checked and is OK, you can save. Now 2FA is enabled on your webmail account.
 
 
 
-#### Log in when Two Factor Authentication is activated
+### Log in when Two Factor Authentication is activated
 When you log in, use your **Disroot** credentials and click on **LOGIN**. You will then have a second login page that asks for your **2FA code**. Use the one provided by your 2FA app and click on **LOGIN**
 
 ![2fa login](en/2fa_login.png)
 
-If you loose access to your Two Factor Authentication app for some reason, you can use one of the **Recovery codes**. Note that once one recovery code is used, it is deleted, so you can't use it anymore.
+If you loose access to your Two Factor Authentication app for some reason, you can use one of the **Recovery codes**.
+
+!! **Note**: Once a recovery code is used, it is deleted, so you can't use it anymore.

pages/02.tutorials/03.Email/03.Webmail/Roundcube/02.settings/docs.en.md

@@ -16,6 +16,9 @@ page-toc:
     active: false
 ---
 
+# Webmail Settings
+
+
 # Table of Content
 ## [01. Preferences](01.preferences)
   - User interface

pages/02.tutorials/03.Email/03.Webmail/docs.en.md

@@ -28,7 +28,7 @@ A webmail, or web-based email, is an email service that can be accessed using th
 # What is Roundcube?
 Roundcube is a free and open source webmail software that provides all the functionalities you would expect from an email client: full support for MIME and HTML messages, multiple sender identities, address book with groups and LDAP connectors, threaded message listing, spell checking, support for access control lists (ACL), import/export functions and support for PGP encryption among many other features.
 
-Through the following tutorial, we will learn how to use **Roundcube** and get to know all its features.
+Through the following tutorial, we will learn how to use **Roundcube** and get to know its features.
 
 ----