Attempt to fix mail system peculiarities