expand messaging system - closes #658