Several core changes; java mail 1.4.2