REF #4141: Harmonize Message Properties