yet another mail fix