Switch to MIME type agreed with Simon, in line with RFC6838.