Use new endpoint logic on mail server