[CH,MF]{issue} I22 - refactored ActivityMsg and Database