Added MailCatcher functionality