minor fixes/improvements
diff --git a/releng.control/cc_config.xml b/releng.control/cc_config.xml
index 288dfaa..d63acb3 100644
--- a/releng.control/cc_config.xml
+++ b/releng.control/cc_config.xml
@@ -59,11 +59,12 @@
             <email
                 mailhost="localhost"
                 returnaddress="${env.BUILD_BUILDMASTER_EMAIL}"
+                returnname="${env.BUILD_RETURN_NAME}"
                 skipusers="${env.SKIPUSERS}"
                 subjectprefix="[${project.name}]"
                 spamwhilebroken="false"
                 buildresultsurl="${env.BUILD_RESULT_URL}/${project.name}">
-                <always address="${env.BUILD_TOADDRESS}" />
+                <always address="${env.BUILD_ALWAYS_TO_ADDRESS}" />
             </email>
         </publishers>
     </plugin>