Include the filename in the error email body, and improve the success email greatly