Make AutoSave task configurable
Add messages.properties back to save