#1784 and some add-ons

extends / fixes #1784 with some UX/polish, and support for writing message body in command line