Little bit of refactoring

fixed: messages go down on load