tweaking formatting to include message type
fixing unrecognized variable in Mail call