Inbox display grabbing correct data, now rebase with master