Settings & unread logic fixes