Index: /branches/dev/data/class/GC_SendMail.php
===================================================================
--- /branches/dev/data/class/GC_SendMail.php	(revision 29)
+++ /branches/dev/data/class/GC_SendMail.php	(revision 319)
@@ -35,5 +35,5 @@
 			$name = ereg_replace("<","¡ã", $to_name);
 			$name = ereg_replace(">","¡ä", $name);
-			$name = mb_encode_mimeheader($name);
+			$name = mb_encode_mimeheader(mb_convert_encoding($name, "JIS", CHAR_CODE));
 			$this->to = $name . "<" . $to . ">";
 		} else {
@@ -46,9 +46,13 @@
 		$this->to			 = $to;
 		$this->subject		 = $subject;
-		$this->body			 = $body;
+
+		// iso-2022-jp¤À¤ÈÆüìʸ»ú¤¬¡©¤ÇÁ÷¿®¤µ¤ì¤ë¤Î¤ÇJIS¤ò»ÈÍѤ¹¤ë¡£
+		$this->body			 = mb_convert_encoding( $body, "JIS", CHAR_CODE);
+
 		// ¥Ø¥Ã¥À¡¼¤ËÆüËܸì¤ò»ÈÍѤ¹¤ë¾ì¹ç¤ÏMb_encode_mimeheader¤Ç¥¨¥ó¥³¡¼¥É¤¹¤ë¡£
 		$from_name = ereg_replace("<","¡ã", $from_name);
 		$from_name = ereg_replace(">","¡ä", $from_name);
-				
+		$from_name = mb_convert_encoding($from_name,"JIS",CHAR_CODE); 
+
 		$this->header		 = "From: ". Mb_encode_mimeheader( $from_name )."<".$fromaddress.">\n";
 		$this->header		.= "Reply-To: ". $reply_to . "\n";
@@ -56,14 +60,13 @@
 		$this->header		.= "Bcc: " . $bcc . "\n";
 		$this->header		.= "Errors-To: ". $errors_to ."\n";
-		// return_path¤Ï¡¢¥á¡¼¥ë¥Ø¥Ã¥À¡¼¾å¤Ë·Ù¹ð¤¬É½¼¨¤µ¤ì¤ë¤Î¤ÇÍøÍѤ·¤Ê¤¤¡£
-		$return_path = "";
+		
+		$this->return_path   = $return_path;
 	}
 
-	
 	function setItemHtml( $to, $subject, $body, $fromaddress, $from_name, $reply_to, $return_path, $errors_to="", $bcc="", $cc ="" ) {
 			
 		$this->to			 = $to;
-		$this->subject		 = Mb_encode_mimeheader($subject);
-		$this->body			 = mb_convert_encoding( $body, "iso-2022-jp", CHAR_CODE);
+		$this->subject		 = $subject;
+		$this->body			 = mb_convert_encoding( $body, "JIS", CHAR_CODE);
 		$this->header		 = "Mime-Version: 1.0\n";
 		$this->header		.= "Content-Type: text/html; charset=iso-2022-jp\n";
@@ -74,6 +77,5 @@
 		$this->header		.= "Bcc: " . $bcc . "\n";
 		$this->header		.= "Errors-To: ". $errors_to ."\n";
-		// return_path¤Ï¡¢¥á¡¼¥ë¥Ø¥Ã¥À¡¼¾å¤Ë·Ù¹ð¤¬É½¼¨¤µ¤ì¤ë¤Î¤ÇÍøÍѤ·¤Ê¤¤¡£
-		$return_path = "";
+		$this->return_path   = $return_path;
 	}
 
@@ -82,7 +84,7 @@
 
 		Mb_language( "Japanese" );
-				
+		
 		//¡¡¥á¡¼¥ëÁ÷¿®
-		if( mb_send_mail( $this->to, $this->subject, $this->body, $this->header) ) {
+		if( mb_send_mail( $this->to, $this->subject, $this->body, $this->header, "" . $this->return_path ) ) {
 			return true;
 		}
@@ -95,5 +97,5 @@
 		
 		//¡¡¥á¡¼¥ëÁ÷¿®
-		if( mail( $this->to, $this->subject, $this->body, $this->header) ) {
+		if( mail( $this->to, $this->subject, $this->body, $this->header, "" . $this->return_path ) ) {
 			return true;
 		}