--- email_api.php.old	2006-10-23 22:36:18.000000000 +0900
+++ email_api.php	2006-10-23 22:36:26.000000000 +0900
@@ -646,6 +646,9 @@
         $t_email_data->metadata['priority'] = config_get( 'mail_priority' );               # Urgent = 1, Not Urgent = 5, Disable = 0
         $t_email_data->metadata['charset'] =  lang_get( 'charset', lang_get_current() );
 
+        $_SERVER = ( isset( $_SERVER ) ) ? $_SERVER : $HTTP_SERVER_VARS;
+        $t_email_data->metadata['server_name']  = ( isset( $_SERVER['SERVER_NAME'] ) ) ? $_SERVER['SERVER_NAME'] : '';
+
         $t_email_id = email_queue_add( $t_email_data );
         
         return $t_email_id; 
@@ -694,6 +697,8 @@
 
         $mail = new PHPMailer;
 
+        $mail->Hostname = $t_email_data->metadata['server_name'];
+
         $mail->PluginDir = PHPMAILER_PATH;
 
         # @@@ should this be the current language (for the recipient) or the default one (for the user running the command) (thraxisp)
@@ -1132,4 +1137,4 @@
 
         return $t_bug_data;
     }
-?>
\ ファイル末尾に改行がありません
+?>