fix(eas): handle attachments of type message/rfc822 when sanitize ema…

…ils (fixes #5427) (#304)
Alinto · Nov 18, 2021 · 33b2406 · 33b2406
1 parent 16de167
commit 33b2406
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/ActiveSync/SOGoMailObject+ActiveSync.m b/ActiveSync/SOGoMailObject+ActiveSync.m
@@ -427,7 +427,7 @@ - (void) _sanitizedMIMEPart: (id) thePart
 
       body = [thePart body];
 
-      if ([body isKindOfClass: [NGMimeMultipartBody class]])
+      if ([body isKindOfClass: [NGMimeMultipartBody class]] || [body isKindOfClass: [NGMimeMessage class]])
         {
           [self _sanitizedMIMEPart: body
                          performed: b];
@@ -479,8 +479,7 @@ - (void) _sanitizedMIMEPart: (id) thePart
           RELEASE(fdata);
           *b = YES;
         }
-      else if ([[(NGMimeContentDispositionHeaderField *)[thePart  headerForKey: @"content-disposition"] type] hasPrefix: @"attachment"] ||
-                [[(NGMimeContentDispositionHeaderField *)[thePart  headerForKey: @"content-disposition"] type] hasPrefix: @"inline"])
+      else if ([body isKindOfClass: [NSData class]])
         {
           [thePart setHeader: @"base64"  forKey: @"content-transfer-encoding"];
           [thePart setBody: [body dataByEncodingBase64]];