3.4 Reorganized mail configuration