Minor fix to messageService retry counter
Moved normalization of phone number  to setter of User