From 9d7bbbc312cbe8ccb535e24308be111a3a2eb710 Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Mon, 23 Mar 2015 14:55:14 -0400
Subject: [PATCH] enable by default HTML mails support using EAS on Windows and
 BB phones

---
 ActiveSync/SOGoActiveSyncDispatcher.m | 1 +
 NEWS                                  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/ActiveSync/SOGoActiveSyncDispatcher.m b/ActiveSync/SOGoActiveSyncDispatcher.m
index 795791612..fc73a7b5e 100644
--- a/ActiveSync/SOGoActiveSyncDispatcher.m
+++ b/ActiveSync/SOGoActiveSyncDispatcher.m
@@ -1937,6 +1937,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   [s appendString: @"<?xml version=\"1.0\" encoding=\"utf-8\"?>"];
   [s appendString: @"<!DOCTYPE ActiveSync PUBLIC \"-//MICROSOFT//DTD ActiveSync//EN\" \"http://www.microsoft.com/\">"];
   [s appendString: @"<Provision xmlns=\"Provision:\">"];
+  [s appendString: @"<AllowHTMLEmail>1</AllowHTMLEmail>"];
   [s appendString: @"</Provision>"];
   
   d = [[s dataUsingEncoding: NSUTF8StringEncoding] xml2wbxml];
diff --git a/NEWS b/NEWS
index 1136cf8b9..0d172d38d 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@ Enhancements
  - support for mail prority using EAS
  - immediately delete mails from EAS clients when they are marked as deleted on the IMAP server
  - now favor login@domain as the default email address if multiple mail: fields are specified
+ - enable by default HTML mails support using EAS on Windows and BB phones
 
 Bug fixes
  - fixed login issue after password change (#2601)