diff --git a/FAQ.md b/FAQ.md
index 06e212b2aa..cd7f3a773c 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -29,7 +29,8 @@ for instance when two factor authentication is enabled.
 For authorizing:
 
 * Gmail / G suite: see [question 6](#user-content-faq6)
-* Outlook / Hotmail: see [question 14](#user-content-faq14)
+* 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)
@@ -134,7 +135,7 @@ Fonts, sizes, colors, etc should be material design whenever possible.
 * [~~(10) What does 'UIDPLUS not supported' mean?~~](#user-content-faq10)
 * [(12) How does encryption/decryption work?](#user-content-faq12)
 * [(13) How does search on device/server work?](#user-content-faq13)
-* [(14) How can I setup Outlook / Live / Hotmail with 2FA?](#user-content-faq14)
+* [(14) How can I set up an Outlook / Live / Hotmail account?](#user-content-faq14)
 * [(15) Why does the message text keep loading?](#user-content-faq15)
 * [(16) Why are messages not being synchronized?](#user-content-faq16)
 * [~~(17) Why does manual synchronize not work?~~](#user-content-faq17)
@@ -274,6 +275,7 @@ Fonts, sizes, colors, etc should be material design whenever possible.
 * [(153) Why does permanently deleting Gmail message not work?](#user-content-faq153)
 * [(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)
 
 [I have another question.](#user-content-support)
 
@@ -783,13 +785,17 @@ Searching messages on the device is a free feature, searching messages on the se
 <br />
 
 <a name="faq14"></a>
-**(14) How can I setup Outlook / Live / Hotmail with 2FA?**
+**(14) How can I set up an Outlook / Live / Hotmail account?**
+
+An Outlook / Live / Hotmail account can be set up via the quick setup wizard and selecting *Outlook*.
 
 To use an Outlook, Live or Hotmail account with two factor authentication enabled, you need to create an app password.
 See [here](https://support.microsoft.com/en-us/help/12409/microsoft-account-app-passwords-two-step-verification) for the details.
 
 See [here](https://support.office.com/en-us/article/pop-imap-and-smtp-settings-for-outlook-com-d088b986-291d-42b8-9564-9c414e2aa040) for Microsoft's instructions.
 
+For setting up an Office365 account, please see [this FAQ](#user-content-faq156).
+
 <br />
 
 <a name="faq15"></a>
@@ -3041,6 +3047,17 @@ You can view it with for example the Android app [Letter Opener](https://play.go
 
 <br />
 
+<a name="faq156"></a>
+**(156) How can I set up an Office365 account?**
+
+An Office365 account can be set up via the quick setup wizard and selecting *Office365 (OAuth)*.
+
+If the wizard ends with *AUTHENTICATE failed*, IMAP and/or SMTP might be disabled for the account.
+In this case you should ask the administrator to enable IMAP and SMTP.
+The procedure is documented [here](https://docs.microsoft.com/en-in/exchange/troubleshoot/configure-mailboxes/pop3-imap-owa-activesync-office-365).
+
+<br />
+
 ## Support
 
 Only the latest Play store version and latest GitHub release are supported.