Little refactor on kzmail service