Modifying messages template to be more like the default from the package