squashed from inbox-impl branch
Merge pull request #245 from Horusiath/dev

Implementation of the Inbox feature