Updated addMessage
Revert "Updated addMessage"

This reverts commit 9a2097305a68b366af9cd5741f705a4f50714087.
Revert "Revert "Updated addMessage""

This reverts commit a7526485af43fd59921d8ed3340fc41b606908a0.