Added initial support for saving messages