removed buggy behaviour in latest Mail release.