Rmail fix