Adding mail generator service see #6193