SMTP URL matching and testing improved #38