Manual merge of edchapel's code

User edchapel contributed command-line option to disable file saving of
emails. Thanks Ed!