add mailcatcher support