Message persistence

Add option message_persistence