Index: /branches/version-2_13-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php
===================================================================
--- /branches/version-2_13-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php	(revision 23606)
+++ /branches/version-2_13-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php	(revision 23620)
@@ -54,5 +54,5 @@
         $this->arrSex = $masterData->getMasterData('mtb_sex');
         $this->arrPageRows = $masterData->getMasterData('mtb_page_max');
-        $this->arrHtmlmail = array('' => '両方',  1 => 'HTML', 2 => 'TEXT');
+        $this->arrHtmlmail = array('' => 'HTML+TEXT',  1 => 'HTML', 2 => 'TEXT', 99 => '全員（メルマガ拒否している会員も含む）');
         $this->arrMailType = $masterData->getMasterData('mtb_mail_type');
 
Index: /branches/version-2_13-dev/data/class/SC_CustomerList.php
===================================================================
--- /branches/version-2_13-dev/data/class/SC_CustomerList.php	(revision 23546)
+++ /branches/version-2_13-dev/data/class/SC_CustomerList.php	(revision 23620)
@@ -174,6 +174,9 @@
                 $this->setWhere('status = 2');
                 if (SC_Utils_Ex::sfIsInt($this->arrSql['search_htmlmail'])) {
-                    $this->setWhere('mailmaga_flg = ?');
-                    $this->arrVal[] = $this->arrSql['search_htmlmail'];
+                    // メルマガ拒否している会員も含む場合は、条件を付加しない
+                    if ($this->arrSql['search_htmlmail'] != 99) {
+                        $this->setWhere('mailmaga_flg = ?');
+                        $this->arrVal[] = $this->arrSql['search_htmlmail'];
+                    }
                 } else {
                     //　メルマガ購読拒否は省く
Index: /branches/version-2_13-dev/data/Smarty/templates/admin/mail/index.tpl
===================================================================
--- /branches/version-2_13-dev/data/Smarty/templates/admin/mail/index.tpl	(revision 23546)
+++ /branches/version-2_13-dev/data/Smarty/templates/admin/mail/index.tpl	(revision 23620)
@@ -37,5 +37,6 @@
                 <!--{assign var=key value="search_htmlmail"}-->
                 <!--{if $arrErr[$key]}--><span class="attention"><!--{$arrErr[$key]}--></span><br /><!--{/if}-->
-                <!--{html_radios name=$key options=$arrHtmlmail separator="&nbsp;" selected=$arrForm[$key].value}-->
+                <!--{html_radios name=$key options=$arrHtmlmail separator="&nbsp;" selected=$arrForm[$key].value}--><br />
+                <span class="attention">「全員（メルマガ拒否している会員も含む） 」を選択される場合は、メンテナンス告知など、運用関連の配信のみとして下さい。</span>
             </td>
         </tr>
@@ -113,5 +114,5 @@
                 <td><!--{$arrResults[i].email|h}--></td>
                 <!--{assign var="key" value="`$arrResults[i].mailmaga_flg`"}-->
-                <td class="center"><!--{$arrHtmlmail[$key]}--></td>
+                <td class="center"><!--{$arrHtmlmail[$key]|default:'なし'}--></td>
                 <td class="center"><!--{$arrResults[i].update_date|sfDispDBDate}--></td>
             </tr>