Go with Mail 1.8.1