diff --git a/user-guide/evolution_for_o365.md b/user-guide/evolution_for_o365.md
new file mode 100644
index 00000000..0c4e4a99
--- /dev/null
+++ b/user-guide/evolution_for_o365.md
@@ -0,0 +1,68 @@
+# Configure Evolution for 0ffice365
+
+## Account and MFA ready?
+Before connecting to Evolution to Office365, you need to have your MFA token/app configured.
+
+If you use an app or SMS, then you can set it up directly at [Microsoft](https://aka.ms/mfasetup). Note that when you select the app and use "Use verification code", then you can also use 3rd party OTP apps.
+
+For all the options check out the internal [knowledge base article](https://psi.service-now.com/kb_view.do?sysparm_article=KB0002928)
+
+## Configure Your Mail Account
+
+If you first open Evolution you get automatically to the "Mail Configuration Assistant", else you select in the "Edit" menu "Accounts", and then klick the "+Add" dropdown and select `Mail Account`. Then you should get
+
+![Welcome](evolution_for_o365/evolution01_wizard_welcome.png)
+
+Here go on with "Next",
+
+![Restore](evolution_for_o365/evolution02_wizard_restore.png)
+
+and with "Next" again
+
+![Identity](evolution_for_o365/evolution03_wizard_identity.png)
+
+and finally fill in your Name (as it should be shown in outgoing emails) and your email address. Also tell Evolution to not try to figure out the server itself. After continuing:
+
+![Receiving Email](evolution_for_o365/evolution04_wizard_receiving.png)
+
+Now change the "Server Type" to `Exchange Web Service`, enter as username again your email address and put `https://outlook.office365.com/EWS/Exchange.asmx` as "Host URL". On the "Authentication" part override the Office365 OAuth2 settings with
+
+Tenant: `50f89ee2-f910-47c5-9913-a6ea08928f11`  
+Applicatin ID: `751cf8be-ca07-484b-9308-fac4b9d85eff`
+
+and then go on. There is nothing more to change:
+
+![Receiving Options](evolution_for_o365/evolution05_wizard_options.png)
+
+![Account Summary](evolution_for_o365/evolution06_wizard_summary.png)
+
+![Done](evolution_for_o365/evolution07_wizard_done.png)
+
+But then for authentication you then get a web popup:
+
+![Office365 account authentication request](evolution_for_o365/evolution08_oauth2_user.png)
+
+Here enter your email address
+
+![Office365 account authentication request MFA](evolution_for_o365/evolution09_oauth2_password.png)
+
+then enter your normal AD/Windows password
+
+
+![Office365 account authentication request password](evolution_for_o365/evolution10_oauth2_2fa.png)
+
+Followed by your MFA approval (in the Authenticator app or with a token code).
+
+![Inbox](evolution_for_o365/evolution11_inbox.png)
+
+And finally enjoy your inbox.
+
+
+
+
+
+
+
+
+
+
diff --git a/user-guide/evolution_for_o365/evolution01_wizard_welcome.png b/user-guide/evolution_for_o365/evolution01_wizard_welcome.png
new file mode 100644
index 00000000..f7f403e1
Binary files /dev/null and b/user-guide/evolution_for_o365/evolution01_wizard_welcome.png differ
diff --git a/user-guide/evolution_for_o365/evolution02_wizard_restore.png b/user-guide/evolution_for_o365/evolution02_wizard_restore.png
new file mode 100644
index 00000000..c08b5168
Binary files /dev/null and b/user-guide/evolution_for_o365/evolution02_wizard_restore.png differ
diff --git a/user-guide/evolution_for_o365/evolution03_wizard_identity.png b/user-guide/evolution_for_o365/evolution03_wizard_identity.png
new file mode 100644
index 00000000..4fd8bda2
Binary files /dev/null and b/user-guide/evolution_for_o365/evolution03_wizard_identity.png differ
diff --git a/user-guide/evolution_for_o365/evolution04_wizard_receiving.png b/user-guide/evolution_for_o365/evolution04_wizard_receiving.png
new file mode 100644
index 00000000..ed1a4872
Binary files /dev/null and b/user-guide/evolution_for_o365/evolution04_wizard_receiving.png differ
diff --git a/user-guide/evolution_for_o365/evolution05_wizard_options.png b/user-guide/evolution_for_o365/evolution05_wizard_options.png
new file mode 100644
index 00000000..8cc0f6eb
Binary files /dev/null and b/user-guide/evolution_for_o365/evolution05_wizard_options.png differ
diff --git a/user-guide/evolution_for_o365/evolution06_wizard_summary.png b/user-guide/evolution_for_o365/evolution06_wizard_summary.png
new file mode 100644
index 00000000..9fdf66d7
Binary files /dev/null and b/user-guide/evolution_for_o365/evolution06_wizard_summary.png differ
diff --git a/user-guide/evolution_for_o365/evolution07_wizard_done.png b/user-guide/evolution_for_o365/evolution07_wizard_done.png
new file mode 100644
index 00000000..7d7b7ccd
Binary files /dev/null and b/user-guide/evolution_for_o365/evolution07_wizard_done.png differ
diff --git a/user-guide/evolution_for_o365/evolution08_oauth2_user.png b/user-guide/evolution_for_o365/evolution08_oauth2_user.png
new file mode 100644
index 00000000..b09e9757
Binary files /dev/null and b/user-guide/evolution_for_o365/evolution08_oauth2_user.png differ
diff --git a/user-guide/evolution_for_o365/evolution09_oauth2_password.png b/user-guide/evolution_for_o365/evolution09_oauth2_password.png
new file mode 100644
index 00000000..250fb72c
Binary files /dev/null and b/user-guide/evolution_for_o365/evolution09_oauth2_password.png differ
diff --git a/user-guide/evolution_for_o365/evolution10_oauth2_2fa.png b/user-guide/evolution_for_o365/evolution10_oauth2_2fa.png
new file mode 100644
index 00000000..1c855856
Binary files /dev/null and b/user-guide/evolution_for_o365/evolution10_oauth2_2fa.png differ
diff --git a/user-guide/evolution_for_o365/evolution11_inbox.png b/user-guide/evolution_for_o365/evolution11_inbox.png
new file mode 100644
index 00000000..14a9554f
Binary files /dev/null and b/user-guide/evolution_for_o365/evolution11_inbox.png differ