fixed mail somewhat