Merge "Fixup contenttype stuff in UserMailer"