mail-test copy from tommy
add mail-test