Some changes and additions to the messages app
Merge pull request #32 from roydude/v1-train

Some changes and additions to the messages app