Made code for unread markers more angular. Issue: #635