Code cleaning / small refactor.
Bugfix: message deletion at main message list.