Feature/unread count

Stay constistend with the other functions.