updated mailcatcher stuff