CAL-628 backport Missing labels on attachment of Preview popup