Upgrade and adapt to the new MessageFormat version