Second attempt at fixing message flashing

Previous try resulted in it flashing twice...