This is combination of the changes in 8f4bb679 and 33bbdbb3. This is needed as we can end up here for sub-types of multipart/mixed, which we don't want to handle at all. BUG: 385526