re-enable mail + remove commented style