Messages while syncing improved