quickMessage cleanup
Merge pull request #1867 from erikdesjardins/quickMessage-cleanup

quickMessage cleanup