Resolved messages bug