Now only emit message if saved