unstick mail dependency from 2.5.3