From 0a417f4adb048da731ad179847c704db1a607ffa Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Mon, 4 Apr 2016 08:21:15 -0400
Subject: [PATCH] (fix) sanitize non-us-ascii 7bit emails

---
 ActiveSync/SOGoMailObject+ActiveSync.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ActiveSync/SOGoMailObject+ActiveSync.m b/ActiveSync/SOGoMailObject+ActiveSync.m
index d2e2e839e..9340b465a 100644
--- a/ActiveSync/SOGoMailObject+ActiveSync.m
+++ b/ActiveSync/SOGoMailObject+ActiveSync.m
@@ -485,7 +485,7 @@ struct GlobalObjectId {
     {
       encoding = [[theParts objectAtIndex: i ] objectForKey: @"encoding"];
       charset = [[[theParts objectAtIndex: i ] objectForKey: @"parameterList"] objectForKey: @"charset"];
-      if (encoding && [encoding caseInsensitiveCompare: @"8bit"] == NSOrderedSame &&
+      if (encoding && ([encoding caseInsensitiveCompare: @"7bit"] == NSOrderedSame || [encoding caseInsensitiveCompare: @"8bit"] == NSOrderedSame) &&
           charset  && ![charset caseInsensitiveCompare: @"utf-8"] == NSOrderedSame
                    && ![charset caseInsensitiveCompare: @"us-ascii"] == NSOrderedSame)
         {