diff --git a/ActiveSync/SOGoMailObject+ActiveSync.m b/ActiveSync/SOGoMailObject+ActiveSync.m
index e7797df..a1b8c84 100644
--- a/ActiveSync/SOGoMailObject+ActiveSync.m
+++ b/ActiveSync/SOGoMailObject+ActiveSync.m
@@ -227,6 +227,10 @@ struct GlobalObjectId {
type = [part valueForKey: @"type"];
subtype = [part valueForKey: @"subtype"];
+ // Don't select an attachment as body
+ if ([[[part valueForKey: @"disposition"] valueForKey: @"type"] isEqualToString: @"attachment"])
+ continue;
+
if ([type isEqualToString: @"text"] && [subtype isEqualToString: @"html"])
htmlKey = key;
else if ([type isEqualToString: @"text"] && [subtype isEqualToString: @"plain"])
@@ -439,7 +443,7 @@ struct GlobalObjectId {
{
s = [s htmlToText];
}
-
+
d = [s dataUsingEncoding: NSUTF8StringEncoding];
}
else if ([type isEqualToString: @"multipart"])
@@ -734,7 +738,13 @@ struct GlobalObjectId {
len = [content length];
[s appendString: @""];
- [s appendFormat: @"%d", preferredBodyType];
+
+ // Set the correct type if client requested text/html but we got text/plain
+ if (preferredBodyType == 2 && nativeBodyType == 1)
+ [s appendString: @"1"];
+ else
+ [s appendFormat: @"%d", preferredBodyType];
+
[s appendFormat: @"%d", truncated];
[s appendFormat: @""];