Updated using version 1.38 from syncmail project.