Merge pull request 392 + fix multi tenant mail remaining configs