BOOK-770, small refactor in taskmail
Merge pull request #948 from onepercentclub/feature/BOOK-770

WIP BOOK-770, small refactor in taskmail