Fixed e-mail templates + extended tests to alternative content types
Fixed circular import
Merge pull request #921 from maykinmedia/bb-1891

Bb 1891