better formatting to retain original message lines and colons
replace cl-lib functions with dash functions