Ensure non-staff activities are all messages