152a153,166
>   // Add client's preferred language to mail header
>   $langcode = $message['language']->language;
>   if ($langcode) {
>     $headers['Content-Language'] = $langcode;
>   }
>   // Add originating module identity
>   if (isset($module)) {
>     $headers['X-Mailer'] = 'Drupal / '.$module;
>   }
>   // Add originating client's IP
>   $originatingIp=ip_address();
>   if (isset($originatingIp)) {
>     $headers['X-Originating-IP'] = $originatingIp;
>   }
154a169
>