diff --git a/includes/webform.submissions.inc b/includes/webform.submissions.inc
index 40f8fa80..cd9a140d 100644
--- a/includes/webform.submissions.inc
+++ b/includes/webform.submissions.inc
@@ -328,7 +328,7 @@ function webform_submission_send_mail($node, $submission, $emails = NULL) {
     }
     else {
       // Format the Cc address(es).
-      $mapping = isset($email['extra']['email_mapping']) ? $email['extra']['email_mapping'] : NULL;
+      $mapping = isset($email['extra']['cc_mapping']) ? $email['extra']['cc_mapping'] : NULL;
       $cc = webform_format_email_address($email['cc'], NULL, $node, $submission, TRUE, FALSE, NULL, $mapping);
       $email['cc'] = implode(',', $cc);
     }
diff --git a/tests/WebformEmailTestCase.test b/tests/WebformEmailTestCase.test
index ad2e6891..893f8861 100644
--- a/tests/WebformEmailTestCase.test
+++ b/tests/WebformEmailTestCase.test
@@ -21,8 +21,7 @@ public static function getInfo() {
    */
   public function testEmailDelivery() {
     // Some values to use on the forms.
-    $to_address1 = $this->randomName() . '@example.com';
-    $to_address2 = $this->randomName() . '@example.com';
+    $to_address = $this->randomName() . '@example.com';
     $cc_address = $this->randomName() . '@example.com';
 
     // Login.