Fix GetUnreadMessages to support comments