Finished fully tracking InboxActivity

Refactored some classes and cleaned the code.