Added mechanism to intercept emails.