===> Cleaning for xmail-1.27