From 23681b23d181fd2a7d08685338cbdaa5f72bc554 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 26 Aug 2020 20:15:20 +0200
Subject: [PATCH] Split Outlook, Live, Hotmail

---
 app/src/main/res/values/strings.xml |  2 +-
 app/src/main/res/xml/providers.xml  | 33 +++++++++++++++++++++++++++--
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index acb7a6f7f2..83ea594503 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -164,7 +164,7 @@
     <string name="title_setup_wizard_new">I need a new email address</string>
     <string name="title_setup_wizard_remark">Go \'back\' to go to the inbox</string>
     <string name="title_setup_gmail" translatable="false">Gmail</string>
-    <string name="title_setup_outlook" translatable="false">Outlook</string>
+    <string name="title_setup_outlook" translatable="false">Outlook, Live, Hotmail</string>
     <string name="title_setup_oauth" translatable="false">%1$s (OAuth)</string>
     <string name="title_setup_activesync" translatable="false">Exchange ActiveSync</string>
     <string name="title_setup_other">Other provider</string>
diff --git a/app/src/main/res/xml/providers.xml b/app/src/main/res/xml/providers.xml
index b8230b4aa7..15e1f4f97d 100644
--- a/app/src/main/res/xml/providers.xml
+++ b/app/src/main/res/xml/providers.xml
@@ -20,8 +20,37 @@
     </provider>
     <provider
         name="Outlook"
-        domain="outlook\\..*,live\\..*,hotmail\\..*"
-        id="outlook"
+        domain="outlook\\..*"
+        link="https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq14"
+        order="2"
+        partial="false">
+        <imap
+            host="outlook.office365.com"
+            port="993"
+            starttls="false" />
+        <smtp
+            host="smtp.office365.com"
+            port="587"
+            starttls="true" />
+    </provider>
+    <provider
+        name="Live"
+        domain="live\\..*"
+        link="https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq14"
+        order="2"
+        partial="false">
+        <imap
+            host="outlook.office365.com"
+            port="993"
+            starttls="false" />
+        <smtp
+            host="smtp.office365.com"
+            port="587"
+            starttls="true" />
+    </provider>
+    <provider
+        name="Hotmail"
+        domain="hotmail\\..*"
         link="https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq14"
         order="2"
         partial="false">