Inline css of html emails before showing in the ui so doesn't interfere with ui styling
Merge remote-tracking branch 'upstream/master'