another mail fix