#283 Refactoring For All usage case of unread message is shown correctly