[Main] Fixed Messages Bug