diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java
index 724d83d77d..06669b7077 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccount.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java
@@ -90,6 +90,7 @@ public class FragmentAccount extends FragmentBase {
 
     private Spinner spProvider;
     private TextView tvGmailHint;
+    private TextView tvDocumentation;
 
     private EditText etDomain;
     private Button btnAutoConfig;
@@ -219,6 +220,8 @@ public class FragmentAccount extends FragmentBase {
         // Get controls
         spProvider = view.findViewById(R.id.spProvider);
         tvGmailHint = view.findViewById(R.id.tvGmailHint);
+        tvDocumentation = view.findViewById(R.id.tvDocumentation);
+        tvDocumentation.setMovementMethod(LinkMovementMethodCompat.getInstance());
 
         etDomain = view.findViewById(R.id.etDomain);
         btnAutoConfig = view.findViewById(R.id.btnAutoConfig);
@@ -314,6 +317,8 @@ public class FragmentAccount extends FragmentBase {
                 tvGmailHint.setVisibility(
                         auth == AUTH_TYPE_PASSWORD && "gmail".equals(provider.id)
                                 ? View.VISIBLE : View.GONE);
+                tvDocumentation.setText(provider.documentation == null ? null : HtmlHelper.fromHtml(provider.documentation.toString(), view.getContext()));
+                tvDocumentation.setVisibility(provider.documentation == null ? View.GONE : View.VISIBLE);
                 grpServer.setVisibility(position > 0 ? View.VISIBLE : View.GONE);
                 grpCalendar.setVisibility(position > 0 && !BuildConfig.PLAY_STORE_RELEASE ? View.VISIBLE : View.GONE);
 
@@ -662,6 +667,7 @@ public class FragmentAccount extends FragmentBase {
         Helper.setViewsEnabled(view, false);
 
         tvGmailHint.setVisibility(View.GONE);
+        tvDocumentation.setVisibility(View.GONE);
 
         btnAutoConfig.setEnabled(false);
         pbAutoConfig.setVisibility(View.GONE);
diff --git a/app/src/main/res/layout/fragment_account.xml b/app/src/main/res/layout/fragment_account.xml
index 649bacc3c3..2cd214686b 100644
--- a/app/src/main/res/layout/fragment_account.xml
+++ b/app/src/main/res/layout/fragment_account.xml
@@ -46,6 +46,17 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/spProvider" />
 
+        <TextView
+            android:id="@+id/tvDocumentation"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="6dp"
+            android:text="Provider hint"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            android:textStyle="bold|italic"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvGmailHint" />
+
         <!-- auto config -->
 
         <TextView
@@ -57,7 +68,7 @@
             android:text="@string/title_domain"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvGmailHint" />
+            app:layout_constraintTop_toBottomOf="@id/tvDocumentation" />
 
         <TextView
             android:id="@+id/tvDomainHint"