Fix
Fix
Add and use message-pretty-save