From b0af86c1832e1654582c31ae81608473aca0f4be Mon Sep 17 00:00:00 2001
From: Andrew Chen <achen.code@gmail.com>
Date: Fri, 13 Sep 2013 14:36:02 -0700
Subject: [PATCH] Add IMAP support for Outlook.com. IMAP is no longer a Plus
 feature; removing the note saying that it is.

http://blogs.office.com/b/microsoft-outlook/archive/2013/09/12/outlook-com-now-with-imap.aspx
---
 res/values/strings.xml |  5 -----
 res/xml/providers.xml  | 28 ++++++++++++----------------
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4f1fcfe72..1664314bc 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -761,11 +761,6 @@ Please submit bug reports, contribute new features and ask questions at
 
     <string name="account_clear_dlg_title">Clear Account</string>
 
-    <string name="provider_note_live">Only some \"Plus\" accounts include POP access
-        allowing this program to connect. If you are not able to sign in with
-        your correct email address and password, you may not have a paid
-        \"Plus\" account. Please launch the Web browser to gain access to
-        these mail accounts.</string>
     <string name="provider_note_yahoojp">Be sure to enable POP3 on the Yahoo mail settings page.</string>
     <string name="provider_note_auonejp">Be sure to enable IMAP or POP3 on the au one mail settings page.</string>
     <string name="provider_note_naver">Be sure to enable IMAP or POP3 on the Naver mail settings page.</string>
diff --git a/res/xml/providers.xml b/res/xml/providers.xml
index efb27db22..f98a2887c 100644
--- a/res/xml/providers.xml
+++ b/res/xml/providers.xml
@@ -138,25 +138,21 @@
         <incoming uri="pop3://pop.juno.com" username="$user" />
         <outgoing uri="smtp://smtp.juno.com" username="$user" />
     </provider>
-    <provider id="live" label="Windows Live Hotmail Plus" domain="live.com"
-            note="@string/provider_note_live">
-        <incoming uri="pop3+ssl+://pop3.live.com"  username="$email" />
-        <outgoing uri="smtp+tls+://smtp.live.com" username="$email" />
+    <provider id="live" label="Windows Live Hotmail" domain="live.com">
+        <incoming uri="imap+ssl+://imap-mail.outlook.com"  username="$email" />
+        <outgoing uri="smtp+tls+://smtp-mail.outlook.com" username="$email" />
     </provider>
-    <provider id="hotmail" label="Windows Live Hotmail Plus" domain="hotmail.com"
-            note="@string/provider_note_live">
-        <incoming uri="pop3+ssl+://pop3.live.com"  username="$email" />
-        <outgoing uri="smtp+tls+://smtp.live.com" username="$email" />
+    <provider id="hotmail" label="Hotmail" domain="hotmail.com">
+        <incoming uri="imap+ssl+://imap-mail.outlook.com"  username="$email" />
+        <outgoing uri="smtp+tls+://smtp-mail.outlook.com" username="$email" />
     </provider>
-    <provider id="outlook" label="Windows Live Outlook" domain="outlook.com"
-            note="@string/provider_note_live">
-        <incoming uri="pop3+ssl+://pop3.live.com"  username="$email" />
-        <outgoing uri="smtp+tls+://smtp.live.com" username="$email" />
+    <provider id="outlook" label="Outlook.com" domain="outlook.com">
+        <incoming uri="imap+ssl+://imap-mail.outlook.com"  username="$email" />
+        <outgoing uri="smtp+tls+://smtp-mail.outlook.com" username="$email" />
     </provider>
-    <provider id="msn" label="Windows Live Hotmail Plus" domain="msn.com"
-            note="@string/provider_note_live">
-        <incoming uri="pop3+ssl+://pop3.live.com"  username="$email" />
-        <outgoing uri="smtp+tls+://smtp.live.com" username="$email" />
+    <provider id="msn" label="MSN" domain="msn.com">
+        <incoming uri="imap+ssl+://imap-mail.outlook.com"  username="$email" />
+        <outgoing uri="smtp+tls+://smtp-mail.outlook.com" username="$email" />
     </provider>
     <!-- Note: Mac Mail.app sets IMAP to mail.mac.com, but it's the same server -->
     <provider id="mobileme" label="MobileMe" domain="me.com">