diff --git a/includes/webform.submissions.inc b/includes/webform.submissions.inc
index 1fab4c7..1c01e00 100644
--- a/includes/webform.submissions.inc
+++ b/includes/webform.submissions.inc
@@ -527,6 +527,18 @@ function webform_submission_resend($form, $form_state, $node, $submission) {
   $form['#submission'] = $submission;
 
   foreach ($node->webform['emails'] as $eid => $email) {
+
+    // Replace the "email" field content with chosen email mapping.
+    if (isset($email['extra']['email_mapping']) && !empty($submission->data[$email['email']])) {
+      $component_emails = array();
+      foreach ($submission->data[$email['email']] as $email_value) {
+        if (isset($email['extra']['email_mapping'][$email_value])) {
+          $component_emails[] = $email['extra']['email_mapping'][$email_value];
+        }
+      }
+      $email['email'] = implode(',', $component_emails);
+    }
+
     $email_addresses = array_filter(explode(',', check_plain($email['email'])));
     foreach ($email_addresses as $key => $email_address) {
       $email_addresses[$key] = webform_format_email_address($email_address, NULL, $node, $submission, FALSE);