mail delivery bug solved