Catch few message_inbox_badge cases missed