fixed mail. final build