fixed
resolved conflicts
Merge pull request #77 from ryanbahniuk/last-msg-scroll

Last msg scroll