diff --git a/ActiveSync/SOGoMailObject+ActiveSync.m b/ActiveSync/SOGoMailObject+ActiveSync.m
index 788b800af..448d8546e 100644
--- a/ActiveSync/SOGoMailObject+ActiveSync.m
+++ b/ActiveSync/SOGoMailObject+ActiveSync.m
@@ -285,7 +285,8 @@ struct GlobalObjectId {
                          performed: b];
         }
       else if ([body isKindOfClass: [NSData class]] &&
-               [[[thePart contentType] type] isEqualToString: @"text"])
+               [[[thePart contentType] type] isEqualToString: @"text"] &&
+               ([[[thePart contentType] subType] isEqualToString: @"plain"] || [[[thePart contentType] subType] isEqualToString: @"plain"]))
         {
           // We make sure everything is encoded in UTF-8
           NSString *charset, *s;