mail fix #2