Add mail helper and comments