diff --git a/FAQ.md b/FAQ.md
index 9b98aad020..a9b5e7eb13 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -589,9 +589,15 @@ Note that this will result in extra internet traffic.
 <a name="faq8"></a>
 **(8) Can I use a Microsoft Exchange account?**
 
+The Microsoft Exchange Web Services protocol [is being phased out](https://techcommunity.microsoft.com/t5/Exchange-Team-Blog/Upcoming-changes-to-Exchange-Web-Services-EWS-API-for-Office-365/ba-p/608055).
+So, it makes little sense to add this protocol anymore.
+
 You can use a Microsoft Exchange account if it is accessible via IMAP, which is mostly the case.
 See [here](https://support.office.com/en-us/article/what-is-a-microsoft-exchange-account-47f000aa-c2bf-48ac-9bc2-83e5c6036793) for more information.
 
+Note that the desciption of FairEmail starts with the remark
+that non-standard protocols, like Microsoft Exchange Web Services and Microsoft ActiveSync are not supported.
+
 Please see [here](https://support.office.com/en-us/article/pop-imap-and-smtp-settings-for-outlook-com-d088b986-291d-42b8-9564-9c414e2aa040)
 for the Microsoft documentation about configuring an email client.
 There is also a section about common connection errors and solutions.
@@ -3005,8 +3011,6 @@ Android might rate limit the notification sound, which can cause some new messag
 The Microsoft Exchange ActiveSync protocol [is patented](https://en.wikipedia.org/wiki/Exchange_ActiveSync#Licensing) and can therefore not be supported.
 For this reason you won't find many, if any, other email clients supporting ActiveSync.
 
-The Microsoft Exchange Web Services protocol [is being phased out](https://techcommunity.microsoft.com/t5/Exchange-Team-Blog/Upcoming-changes-to-Exchange-Web-Services-EWS-API-for-Office-365/ba-p/608055).
-
 Note that the desciption of FairEmail starts with the remark
 that non-standard protocols, like Microsoft Exchange Web Services and Microsoft ActiveSync are not supported.
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java
index 75ae0c3a7c..b049b71318 100644
--- a/app/src/main/java/eu/faircode/email/FragmentSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java
@@ -69,6 +69,7 @@ public class FragmentSetup extends FragmentBase {
     private Button btnAccount;
 
     private Button btnIdentity;
+    private TextView tvExchangeSupport;
     private TextView tvIdentityWhat;
     private TextView tvNoComposable;
 
@@ -123,6 +124,7 @@ public class FragmentSetup extends FragmentBase {
         btnAccount = view.findViewById(R.id.btnAccount);
 
         btnIdentity = view.findViewById(R.id.btnIdentity);
+        tvExchangeSupport = view.findViewById(R.id.tvExchangeSupport);
         tvIdentityWhat = view.findViewById(R.id.tvIdentityWhat);
         tvNoComposable = view.findViewById(R.id.tvNoComposable);
 
@@ -259,6 +261,14 @@ public class FragmentSetup extends FragmentBase {
             }
         });
 
+        tvExchangeSupport.setPaintFlags(tvExchangeSupport.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
+        tvExchangeSupport.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Helper.viewFAQ(v.getContext(), 8);
+            }
+        });
+
         tvIdentityWhat.setPaintFlags(tvIdentityWhat.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
         tvIdentityWhat.setOnClickListener(new View.OnClickListener() {
             @Override
diff --git a/app/src/main/res/layout/fragment_setup.xml b/app/src/main/res/layout/fragment_setup.xml
index ef7ec9314e..e1332c2474 100644
--- a/app/src/main/res/layout/fragment_setup.xml
+++ b/app/src/main/res/layout/fragment_setup.xml
@@ -244,6 +244,17 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/barrier_manual" />
 
+        <eu.faircode.email.FixedTextView
+            android:id="@+id/tvExchangeSupport"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:text="@string/title_setup_exchange_support"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            android:textColor="?android:attr/textColorLink"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvAccountIdentity" />
+
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvIdentityWhat"
             android:layout_width="wrap_content"
@@ -253,7 +264,7 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textColor="?android:attr/textColorLink"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvAccountIdentity" />
+            app:layout_constraintTop_toBottomOf="@id/tvExchangeSupport" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvNoComposable"
@@ -472,7 +483,7 @@
             app:constraint_referenced_ids="
             btnAccount,tvAccount,tvImap,tvPop,
             btnIdentity,tvIdentity,tvSmtp,tvAliases,
-            tvAccountIdentity,tvIdentityWhat" />
+            tvAccountIdentity,tvExchangeSupport,tvIdentityWhat" />
 
         <androidx.constraintlayout.widget.Group
             android:id="@+id/grpDataSaver"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9d5f69307d..0e27796c7b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -201,6 +201,7 @@
     <string name="title_setup_manage">Manage</string>
     <string name="title_setup_grant">Grant</string>
     <string name="title_setup_grant_again">Grant required permissions</string>
+    <string name="title_setup_exchange_support">Is Microsoft Exchange supported?</string>
     <string name="title_setup_identity_what">What is an identity?</string>
     <string name="title_setup_permissions">Grant permissions</string>
     <string name="title_setup_permissions_remark">To access contact information (optional)</string>