Closes #712 a bit unsure about the inbox messages, but otherwise it should be working Reviewed-on: #1025
