fixed mail problems