Show up to five previous messages
Merge branch 'alex3'