Fix #1845: Unapproved messages list is empty after mark all read
Fix #1845: Unapproved messages list is empty after mark all read (part 2)
Merge pull request #2020 from mahagr/master

Fix #1845: Unapproved messages list is empty after mark all read