Bugs/1048

Think I finally got it! Take 3 on #1321 and #1048... Hopefully on the right branch this time! Removing the ability to send HTML emails simplified things greatly. This version works well in my tests... What do you think?