Messages alert refactoring;