Get rid of 'messages' hashmap
Add last wrong i18n reference