Added local messages lookup