Make messages list appear again
Fix messages endless scrolling and more clean up