Added support for the inbox, will be restructured