mail service > improved handling of test message