diff --git a/email_configure_client.md b/email_configure_client.md
index 1d513bc0..710624a4 100644
--- a/email_configure_client.md
+++ b/email_configure_client.md
@@ -2,7 +2,11 @@
 
 You can fetch and send emails using your YunoHost instance from desktop email clients such as Mozilla Thunderbird or on your smartphone with applications like K-9 Mail.
 
-##### Generic settings
+Normally, configuring your mail client should be automatic, but if the autoconfiguration fails, you can do it manually following the instructions bellow.
+
+### Generic settings
+
+Here are the element you should enter to manually configure your mail client (`domain.tld` refers to what's after the @ in your email address, and `username` what's before @).
 
 | Protocol | Port | Encryption | Authentication  | Username                               |
 | :--:     | :-:  | :--:       | :--:            | :--:                                   | 
@@ -11,7 +15,7 @@ You can fetch and send emails using your YunoHost instance from desktop email cl
 
 ### <img src="images/thunderbird.png" width=50> Configure Mozilla Thunderbird (on a desktop computer)
 
-The automatic detection tool of Thunderbird does not work yet with YunoHost. You will need to set it up manually. To do so, add the account information, then select port 993 with SSL/TLS for IMAP, and port 587 with STARTTLS for SMTP. Afterwards select 'Normal Password' for Authentication and click on 'Advanced Config'. You will need to accept the certificate exceptions for fetching mails and after you send your first mail. Don't forget to remove the dot before the domain name.
+To manually configure a new account in Thunderbird, add the account information, then select port 993 with SSL/TLS for IMAP, and port 587 with STARTTLS for SMTP. Afterwards select 'Normal Password' for Authentication and click on 'Advanced Config'. You may need to accept the certificate exceptions for fetching mails and after you send your first mail. Don't forget to remove the dot before the domain name.
 
 <img src="/images/thunderbird_config_1.png" width=900>
 <img src="/images/thunderbird_config_2.png" width=900>
@@ -20,7 +24,7 @@ The automatic detection tool of Thunderbird does not work yet with YunoHost. You
 
 ### <img src="images/k9mail.png" width=50> Configure K-9 Mail (on Android)
 
-Follow the following steps. (As for thunderbird, you might need to accept certificates at some points)
+Follow the following steps. (As for Thunderbird, you might need to accept certificates at some points)
 
 <a href="/images/k9mail_config_1.png"><img src="/images/k9mail_config_1.png" width=200/></a>
 <a href="/images/k9mail_config_2.png"><img src="/images/k9mail_config_2.png" width=200/></a>