merge reville/patch-4
Tweak patch for html email & sync text version

Closes #377