Don't check for "unread"
Fixed failing tests
Merge branch 'master' into kingman