diff --git a/FAQ.md b/FAQ.md
index b43cf2010b..7beae8db8a 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -47,6 +47,7 @@ For authorizing:
 * GMX: with two factor authentication you'll need to use [an app password](https://support.gmx.com/security/2fa/application-specific-passwords.html) ([German](https://hilfe.gmx.net/sicherheit/2fa/anwendungsspezifisches-passwort.html))
 * T-online.de: please make sure you use [an email password](https://www.telekom.de/hilfe/festnetz-internet-tv/e-mail/e-mail-adresse-passwoerter-und-sicherheit/passwort-fuer-e-mail-programme-einrichten) (German) and not your account password
 * Ionos (1und1): please make sure you use [an email password](https://www.ionos.de/hilfe/e-mail/problemloesungen-mail-basicmail-business/passwort-fuer-e-mail-konto-bei-11-ionos-aendern/) (German) and not your account password
+* Yandex: please check if [IMAP is enabled](https://yandex.com/support/mail/mail-clients/others.html)
 
 Please see [here](#user-content-faq22) for common error messages and solutions.
 
diff --git a/app/src/main/res/xml/providers.xml b/app/src/main/res/xml/providers.xml
index 7dce2ff404..8c192a7bc0 100644
--- a/app/src/main/res/xml/providers.xml
+++ b/app/src/main/res/xml/providers.xml
@@ -364,9 +364,10 @@
     </provider>
     <provider
         name="Yandex"
+        documentation="Please check if &lt;a href=&quot;https://yandex.com/support/mail/mail-clients/others.html&quot;&gt;IMAP is enabled&lt;/a&gt;"
         domain="yandex\\.com"
         id="yandex"
-        link="https://yandex.com/support/mail/mail-clients.html#imap">
+        link="https://yandex.com/support/mail/mail-clients/others.html">
         <imap
             host="imap.yandex.com"
             port="993"