From f6f64728c08b383cdcf73dd3e070de4fb5d061f8 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Thu, 26 Feb 2015 16:00:03 -0500 Subject: [PATCH] Fix for bug #3116 --- ActiveSync/SOGoMailObject+ActiveSync.m | 5 +++-- NEWS | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ActiveSync/SOGoMailObject+ActiveSync.m b/ActiveSync/SOGoMailObject+ActiveSync.m index 9950975d5..43b55c376 100644 --- 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]; diff --git a/NEWS b/NEWS index 64d1f8f30..4102452cb 100644 --- a/NEWS +++ b/NEWS @@ -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) -------------------