Only add email address to message if present.
replace _ with - in filenames
Replace _ with - in filenames
better header layout.