diff --git a/mbuni/mmlib/mms_uaprof.c b/mbuni/mmlib/mms_uaprof.c
index 38960ce..2319014 100644
--- a/mbuni/mmlib/mms_uaprof.c
+++ b/mbuni/mmlib/mms_uaprof.c
@@ -746,7 +746,7 @@ static int modify_msg(MIMEEntity *msg, MmsUaProfile *prof)
 	  if (sflag || 
 	      (!startp && 
 	       octstr_case_compare(content_type, octstr_imm("multipart/related")) == 0) || 
-	      !prof->ccppaccept.presentation) {
+	      !(prof->ccppaccept.presentation || prof->ccppaccept.all)) {
 	       /* MMS conformance guide says: If presentation part is removed or unsupported, 
 		*  then change content type to multipart/mixed
 		*/