diff --git a/../invite.orig/invite.module b/invite.module
index b077877..bb83051 100644
--- a/../invite.orig/invite.module
+++ b/invite.module
@@ -1022,11 +1022,11 @@ function invite_form_submit($form, &$form_state) {
     $failed_emails = (array)unserialize($_SESSION['invite_failed_emails']);
     $num_failed = count($failed_emails);
   }
 
   $subject = isset($form_state['values']['subject']) ? trim($form_state['values']['subject']) : invite_get_subject();
-  $message = isset($form_state['values']['message']) ? trim($form_state['values']['message']) : NULL;
+  $custom_message = isset($form_state['values']['message']) ? trim($form_state['values']['message']) : NULL;
 
   if (!variable_get('invite_use_users_email', 0)) {
     $from = variable_get('invite_manual_from', '');
   }
   else if ($user->uid) {
@@ -1042,11 +1042,11 @@ function invite_form_submit($form, &$form_state) {
     $code = $form_state['values']['reg_code'] ? $form_state['values']['reg_code'] : invite_generate_code();
     $invite = _invite_substitutions(array(
       'email' => $email,
       'code'  => $code,
       'resent'  => $form_state['values']['resent'],
-      'data'  => array('subject' => $subject, 'message' => $message),
+      'data'  => array('subject' => $subject, 'message' => $custom_message),
     ));
 
     // Send e-mail.
     $params = array('invite' => $invite);
     $message = drupal_mail('invite', 'invite', $email, $language, $params, $from, TRUE);