reworked inbox
Merge pull request #404 from trigun0x2/staging

reworked inbox