Messages are now synced properly