Added mailcatcher
Added mailcatcher