Reestablished message saving which was breaking tests