diff --git a/FAQ.md b/FAQ.md
index c499be49a5..df3b84fe46 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -28,12 +28,13 @@ for instance when two factor authentication is enabled.
 
 For authorizing:
 
-* Gmail / G suite: see [question 6](#user-content-faq6)
-* Outlook / Live / Hotmail: see [question 14](#user-content-faq14)
-* Office365: see [question 14](#user-content-faq156)
-* Microsoft Exchange: see [question 8](#user-content-faq8)
-* Yahoo!: see [question 88](#user-content-faq88)
-* Apple iCloud: see [question 148](#user-content-faq148)
+* Gmail / G suite, see [question 6](#user-content-faq6)
+* Outlook / Live / Hotmail, see [question 14](#user-content-faq14)
+* Office365, see [question 14](#user-content-faq156)
+* Microsoft Exchange, see [question 8](#user-content-faq8)
+* Yahoo!, see [question 88](#user-content-faq88)
+* Apple iCloud, see [question 148](#user-content-faq148)
+* Free.fr, see [question 157](#user-content-faq157)
 
 Please see [here](#user-content-faq22) for common error messages.
 
@@ -277,6 +278,7 @@ Fonts, sizes, colors, etc should be material design whenever possible.
 * [(154) Can you add favicons as contact photos?](#user-content-faq154)
 * [(155) What is a winmail.dat file?](#user-content-faq155)
 * [(156) How can I set up an Office365 account?](#user-content-faq156)
+* [(157) How can I set up an Free.fr account?](#user-content-faq157)
 
 [I have another question.](#user-content-support)
 
@@ -3068,6 +3070,18 @@ The procedure is documented [here](https://docs.microsoft.com/en-in/exchange/tro
 
 <br />
 
+<a name="faq157"></a>
+**(157) How can I set up an Free.fr account?**
+
+Veuillez [voir ici](https://free.fr/assistance/597.html) pour les instructions.
+
+**SMTP est désactivé par défaut**, veuillez [voir ici](https://free.fr/assistance/2406.html) comment il peut être activé.
+
+Veuillez [voir ici](http://jc.etiemble.free.fr/abc/index.php/trucs-astuces/configurer-smtp-free-fr) pour un guide détaillé.
+
+<br />
+
+
 ## Support
 
 Only the latest Play store version and latest GitHub release are supported.
diff --git a/app/src/main/res/xml/providers.xml b/app/src/main/res/xml/providers.xml
index d939f5a061..69ed1f7ed9 100644
--- a/app/src/main/res/xml/providers.xml
+++ b/app/src/main/res/xml/providers.xml
@@ -137,7 +137,7 @@
         name="free.fr"
         appPassword="true"
         domain="free\\.fr"
-        link="http://jc.etiemble.free.fr/abc/index.php/trucs-astuces/configurer-smtp-free-fr">
+        link="https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq157">
         <imap
             host="imap.free.fr"
             port="993"