more refactoring into rhq-msg