Oh I missed typeChange already checked the compose.type. I agree that we should remove  form.dataset.messageType here.