Reinstated original mailcatcher setup
Fixed shell escaping