Added ability to save messages