Index: branches/dev/html/admin/mail/inc_mailmagazine.php
===================================================================
--- branches/dev/html/admin/mail/inc_mailmagazine.php	(revision 11632)
+++ branches/dev/html/admin/mail/inc_mailmagazine.php	(revision 11766)
@@ -238,5 +238,5 @@
 	
 	$sql = "SELECT template_id, subject, mail_method FROM dtb_mailmaga_template WHERE del_flg = 0 ";
-	if ($_POST["htmlmail"] == 2) {
+	if ($_POST["htmlmail"] == 2 || $_POST['mail_type'] == 2) {
 		$sql .= " AND mail_method = 2 ";	//TEXT´õ˾¼Ô¤Ø¤ÎTEST¥á¡¼¥ë¥Æ¥ó¥×¥ì¡¼¥È¥ê¥¹¥È
 	}
Index: branches/dev/html/admin/mail/index.php
===================================================================
--- branches/dev/html/admin/mail/index.php	(revision 11763)
+++ branches/dev/html/admin/mail/index.php	(revision 11766)
@@ -54,5 +54,5 @@
 $objQuery = new SC_Query();
 $objPage->objDate = $objDate;
-$objPage->arrTemplate = getTemplateList($conn);
+$objPage->arrTemplate = getTemplarrTemplateateList($conn);
 
 $objSess = new SC_Session();
@@ -219,5 +219,5 @@
 
 		//-- HTML¥Æ¥ó¥×¥ì¡¼¥È¤ò»ÈÍѤ¹¤ë¾ì¹ç¤Ï¡¢HTML¥½¡¼¥¹¤òÀ¸À®¤·¤ÆBODY¤ØÁÞÆþ
-		if ( $objPage->list_data["mail_method"] == 3 && $objPage->list_data["mail_type"] == 1) {
+		if ( $objPage->list_data["mail_method"] == 3) {
 			$objTemplate = new LC_HTMLtemplate;
 			$objTemplate->list_data = lfGetHtmlTemplateData($_POST['template_id']);