mail fix #3