fix(mail): force TNEF body parts to be decoded in UTF-8

Alinto · Apr 8, 2022 · 2cf77b6 · 2cf77b6
1 parent dcc2ebc
commit 2cf77b6
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/SoObjects/Mailer/SOGoTNEFMailBodyPart.m b/SoObjects/Mailer/SOGoTNEFMailBodyPart.m
@@ -825,8 +825,14 @@ - (void) setPart: (NGMimeBodyPart *) newPart
   ASSIGN (part, newPart);
   if (newPart)
     {
+      NSMutableDictionary *info;
+
+      info = [NSMutableDictionary dictionaryWithDictionary: [newPart bodyInfo]];
+      if ([newPart encoding])
+        [info setObject: [newPart encoding]
+                 forKey: @"encoding"];
       [self setFilename: [[newPart bodyInfo] filename]];
-      [self setPartInfo: [newPart bodyInfo]];
+      [self setPartInfo: info];
     }
   else
     {
@@ -884,6 +890,10 @@ - (NGMimeBodyPart *) bodyPartForData: (NSData *)   _data
   [map setObject: [NSString stringWithFormat: @"%@/%@", _type, _subtype]
           forKey: @"content-type"];
 
+  // Encoding
+  [map setObject: @"utf-8"
+          forKey: @"content-transfer-encoding"];
+
   /* prepare body content */
 
   content = [NSData dataWithBytes: [_data bytes] length: [_data length]];