Added mail specific options