Restyling for compat and removed polling on expired messages