Updated BuildEmail logic for Auto Section