Add more details on Context in Short message