Fix to message

bug fix in message replay and email notification