Initial commit for #1321 and #1048
Removing ability to send HTML emails for the time being
Minor cleanup
Pippin doesn't know the difference between current and default...
Merge pull request #1344 from ghost1227/bugs/1048

Bugs/1048