diff --git a/help/C/intro-first-run.page b/help/C/intro-first-run.page
index 654c359b0d..777966bfac 100644
--- a/help/C/intro-first-run.page
+++ b/help/C/intro-first-run.page
@@ -106,7 +106,7 @@
 
 <section id="server-type-exchange-ews">
 <title>Exchange EWS</title>
-<p>For connecting to a Microsoft Exchange 2007/2010 or OpenChange server. Note that this is currently under development and will replace the <gui>Exchange MAPI</gui> account type in the future. It might not be available yet for your distribution.</p>
+<p>For connecting to a Microsoft Exchange server (version 2007 or newer) or OpenChange server, it is recommended to use the package <sys>evolution-ews</sys>.</p>
 <note style="info package">
   <p>This requires having the <sys>evolution-ews</sys> package installed.</p>
   <if:choose xmlns:if="http://projectmallard.org/if/1.0/">
@@ -131,6 +131,7 @@
 <section id="server-type-exchange-mapi">
 <title>Exchange MAPI</title>
 <p>For connecting to a Microsoft Exchange 2007/2010 or OpenChange server.</p>
+<p>It uses Microsoft's Messaging API which is also used by Microsoft Outlook. However, <sys>evolution-mapi</sys> requires installing <sys>OpenChange</sys> and <sys>Samba 4</sys>, and is not as performant as <sys>evolution-ews</sys>.</p>
 <note style="info package">
   <p>This requires having the <sys>evolution-mapi</sys> package installed.</p>
   <if:choose xmlns:if="http://projectmallard.org/if/1.0/">
diff --git a/help/C/mail-account-manage-microsoft-exchange-evo-ews.page b/help/C/mail-account-manage-microsoft-exchange-evo-ews.page
index 86bec06f5f..4fb6afd889 100644
--- a/help/C/mail-account-manage-microsoft-exchange-evo-ews.page
+++ b/help/C/mail-account-manage-microsoft-exchange-evo-ews.page
@@ -23,6 +23,9 @@
 <title>Account Editor</title>
 <p>Mail accounts can be added by choosing <guiseq><gui>File</gui><gui>New</gui><gui>Mail Account</gui></guiseq> or via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Add</gui></guiseq>. The steps are mostly the same as for the <link xref="intro-first-run">First-Run Assistant</link>, except for not getting asked whether to import data from other applications or to restore from a backup file.</p>
 <p>Mail accounts can be edited via <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui></guiseq> or by right-clicking on the respective top-level node in the folder list and choosing <gui>Properties</gui>.</p>
+
+<note style="tip"><p>See also the <link href="https://wiki.gnome.org/Apps/Evolution/EWS/OAuth2">documentation how to set up and troubleshoot OAuth2</link> authentication.</p></note>
+
 <p>The following settings are available when editing an existing account:</p>
 
 <section id="identity">
diff --git a/help/C/mail-account-manage-microsoft-exchange.page b/help/C/mail-account-manage-microsoft-exchange.page
index f69317b284..dd7c93c198 100644
--- a/help/C/mail-account-manage-microsoft-exchange.page
+++ b/help/C/mail-account-manage-microsoft-exchange.page
@@ -23,7 +23,7 @@
 
 <note style="important"><p>Depending on the version of the Microsoft Exchange server that you would like to connect to it is required to make sure that an additional package is installed that provides this functionality.</p>
 
-<p>For Microsoft Exchange 2007, 2010 and newer it is recommended to use the package <sys>evolution-ews</sys>.</p>
+<p>For connecting to a Microsoft Exchange server (version 2007 or newer) or OpenChange server, it is recommended to use the package <sys>evolution-ews</sys>.</p>
 <if:choose xmlns:if="http://projectmallard.org/if/1.0/">
   <if:when test="action:install">
     <note style="info package">
@@ -32,8 +32,7 @@
   </if:when>
 </if:choose>
 
-
-<p>For older versions of Microsoft Exchange, or if <sys>evolution-ews</sys> does not work well for you, try <sys>evolution-mapi</sys>. It uses Microsoft's Messaging API which is also used by Microsoft Outlook. However, <sys>evolution-mapi</sys> requires installing <sys>OpenChange</sys> and <sys>Samba 4</sys>, and is not as performant as <sys>evolution-ews</sys>.</p>
+<p>For older versions of Microsoft Exchange, or if <sys>evolution-ews</sys> does not work well for you, try <sys>evolution-mapi</sys>.</p><p>It uses Microsoft's Messaging API which is also used by Microsoft Outlook. However, <sys>evolution-mapi</sys> requires installing <sys>OpenChange</sys> and <sys>Samba 4</sys>, and is not as performant as <sys>evolution-ews</sys>.</p>
 
 <if:choose xmlns:if="http://projectmallard.org/if/1.0/">
   <if:when test="action:install">