and shorten test response messages in badmailfromto
which will merge into the main branch fairly easily