diff -uNr SOGo-2.3.9/ActiveSync/SOGoMailObject+ActiveSync.m SOGo-2.3.9-2/ActiveSync/SOGoMailObject+ActiveSync.m
--- SOGo-2.3.9/ActiveSync/SOGoMailObject+ActiveSync.m	2016-03-16 18:14:43.000000000 +0200
+++ SOGo-2.3.9-2/ActiveSync/SOGoMailObject+ActiveSync.m	2016-03-16 20:56:20.526947500 +0200
@@ -523,7 +523,7 @@
   else if ([type isEqualToString: @"multipart"])
     *theNativeType = 4;
 
-  if (([subtype isEqualToString: @"signed"] || [subtype isEqualToString: @"pkcs7-mime"] ) && theMimeSupport > 0)
+  if (([subtype isEqualToString: @"signed"] || [subtype hasSuffix: @"pkcs7-mime"] || [subtype hasSuffix: @"encrypted"]) && theMimeSupport > 0)
     {
       *theNativeType = 4;
       isSMIME = YES;
@@ -931,7 +931,7 @@
       // MesssageClass and ContentClass
       if ([subtype isEqualToString: @"signed"])
         [s appendFormat: @"<MessageClass xmlns=\"Email:\">%@</MessageClass>", @"IPM.Note.SMIME.MultipartSigned"];
-      else if ([subtype isEqualToString: @"pkcs7-mime"])
+      else if ([subtype hasSuffix: @"pkcs7-mime"] || [subtype hasSuffix: @"encrypted"])
         [s appendFormat: @"<MessageClass xmlns=\"Email:\">%@</MessageClass>", @"IPM.Note.SMIME"];
       else
         [s appendFormat: @"<MessageClass xmlns=\"Email:\">%@</MessageClass>", @"IPM.Note"];
@@ -1096,7 +1096,7 @@
           // For s/mime mails type is always 4 if mimeSupport is 1 or 2.
           if (preferredBodyType == 2 && nativeBodyType == 1)
              [s appendString: @"<Type>1</Type>"];
-          else if (([subtype isEqualToString: @"signed"] || [subtype isEqualToString: @"pkcs7-mime"] ) && mimeSupport > 0)
+          else if (([subtype isEqualToString: @"signed"] || [subtype hasSuffix: @"pkcs7-mime"] || [subtype hasSuffix: @"encrypted"]) && mimeSupport > 0)
              [s appendString: @"<Type>4</Type>"];
           else
              [s appendFormat: @"<Type>%d</Type>", preferredBodyType];
diff -uNr SOGo-2.3.9/SoObjects/Mailer/SOGoMailObject.m SOGo-2.3.9-2/SoObjects/Mailer/SOGoMailObject.m
--- SOGo-2.3.9/SoObjects/Mailer/SOGoMailObject.m	2016-03-16 18:14:43.000000000 +0200
+++ SOGo-2.3.9-2/SoObjects/Mailer/SOGoMailObject.m	2016-03-16 20:57:30.194659195 +0200
@@ -851,7 +851,7 @@
 
           // We set the path to 0 in case of a smime mail if not provided.
           subtype = [[part objectForKey: @"subtype"] lowercaseString];
-          if ([subtype isEqualToString: @"pkcs7-mime"])
+          if ([subtype hasSuffix: @"pkcs7-mime"])
              path = @"0";
         }