diff --git a/ActiveSync/SOGoMailObject+ActiveSync.m b/ActiveSync/SOGoMailObject+ActiveSync.m
index 3dbc74828..cfee21a81 100644
--- a/ActiveSync/SOGoMailObject+ActiveSync.m
+++ b/ActiveSync/SOGoMailObject+ActiveSync.m
@@ -541,7 +541,7 @@ struct GlobalObjectId {
       // 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.
       encoding = [[self lookupInfoForBodyPart: @""] objectForKey: @"encoding"];
-      if ([[context objectForKey: @"DeviceType"] isEqualToString: @"WindowsOutlook15"] || ([encoding caseInsensitiveCompare: @"8bit"] == NSOrderedSame))
+      if (encoding && ([encoding caseInsensitiveCompare: @"8bit"] == NSOrderedSame))
         d = [self _sanitizedMIMEMessage];
       else
         d = [self content];
diff --git a/NEWS b/NEWS
index ecd03ee5c..bfe555813 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@
 New features
 
 Enhancements
+ - we no longer always entirely rewrite messages for Outlook 2013 when using EAS
 
 Bug fixes
  - numerous EAS fixes when connections are dropped before the EAS client receives the response (#3058, #2849)