Added mail protection