Lock mail dependency to v2.5.4