made test mail work again
Merge branch 'local'