Fix for bug #3116

2015-02-26 16:00:03 -05:00 · 2015-02-26 16:00:03 -05:00 · 5ceddc213e
parent b97002565e
commit 5ceddc213e
2 changed files with 4 additions and 2 deletions
--- a/ActiveSync/SOGoMailObject+ActiveSync.m
+++ b/ActiveSync/SOGoMailObject+ActiveSync.m
@ -469,9 +469,10 @@ struct GlobalObjectId {
    }
  else if (theType == 4)
    {
-      // We sanitize the content *ONLY* for Outlook clients. Outlook has strange issues
+      // We sanitize the content *ONLY* for Outlook clients and if the content-transfer-encoding is 8bit. Outlook has strange issues
      // with quoted-printable/base64 encoded text parts. It just doesn't decode them.
-      if ([[context objectForKey: @"DeviceType"] isEqualToString: @"WindowsOutlook15"])
+      encoding = [[self lookupInfoForBodyPart: @""] objectForKey: @"encoding"];
+      if ([[context objectForKey: @"DeviceType"] isEqualToString: @"WindowsOutlook15"] || ([encoding caseInsensitiveCompare: @"8bit"] == NSOrderedSame))
        d = [self _sanitizedMIMEMessage];
      else
        d = [self content];
--- a/1
+++ b/1
@ -3,6 +3,7 @@

 Bug fixes
 - fixed login issue after password change (#2601)
+ - fixed potential encoding issue using EAS and 8-bit mails (#3116)

 2.2.16 (2015-02-12)
 -------------------