Index: branches/version-2_11-dev/data/Smarty/templates/admin/mail/query.tpl
===================================================================
--- branches/version-2_11-dev/data/Smarty/templates/admin/mail/query.tpl	(revision 21029)
+++ branches/version-2_11-dev/data/Smarty/templates/admin/mail/query.tpl	(revision 21365)
@@ -29,5 +29,4 @@
 //-->
 </script>
-</head>
 
 <form name="form1" id="form1" method="post" action="?">
@@ -38,10 +37,6 @@
     <table class="form">
         <tr>
-            <th>お名前</th>
-            <td><!--{$arrSearchData.search_name|default:"(未指定)"|h}--></td>
-        </tr>
-        <tr>
-            <th>お名前(フリガナ)</th>
-            <td><!--{$arrSearchData.search_kana|default:"(未指定)"|h}--></td>
+            <th>顧客ID</th>
+            <td><!--{$arrSearchData.search_customer_id|default:"(未指定)"|h}--></td>
         </tr>
         <tr>
@@ -54,6 +49,10 @@
         </tr>
         <tr>
-            <th>TEL</th>
-            <td><!--{$arrSearchData.search_tel|default:"(未指定)"|h}--></td>
+            <th>お名前</th>
+            <td><!--{$arrSearchData.search_name|default:"(未指定)"|h}--></td>
+        </tr>
+        <tr>
+            <th>お名前(フリガナ)</th>
+            <td><!--{$arrSearchData.search_kana|default:"(未指定)"|h}--></td>
         </tr>
         <tr>
@@ -73,23 +72,10 @@
         </tr>
         <tr>
-            <th>配信形式</th>
-            <td><!--{$arrSearchData.htmlmail_disp|default:"(未指定)"|h}--></td>
-        </tr>
-        <tr>
-            <th>購入回数</th>
+            <th>誕生日</th>
             <td>
-                <!--{if $arrSearchData.search_buy_times_from == null}-->(未指定)<!--{else}--><!--{$arrSearchData.search_buy_times_from|h}-->回<!--{/if}--> ～ 
-                <!--{if $arrSearchData.search_buy_times_to == null}-->(未指定)<!--{else}--><!--{$arrSearchData.search_buy_times_to|h}-->回<!--{/if}-->
-            </td>
-        </tr>
-        <tr>
-            <th>購入商品コード</th>
-            <td><!--{$arrSearchData.search_buy_product_code|default:"(未指定)"|h}--></td>
-        </tr>
-        <tr>
-            <th>購入金額</th>
-            <td>
-                <!--{if $arrSearchData.search_buy_total_from == null}-->(未指定)<!--{else}--><!--{$arrSearchData.search_buy_total_from|h}-->円<!--{/if}--> ～ 
-                <!--{if $arrSearchData.search_buy_total_to == null}-->(未指定)<!--{else}--><!--{$arrSearchData.search_buy_total_to|h}-->円<!--{/if}-->
+            <!--{if $arrSearchData.search_b_start_year}-->
+                <!--{$arrSearchData.search_b_start_year}-->年<!--{$arrSearchData.search_b_start_month}-->月<!--{$arrSearchData.search_b_start_day}-->日&nbsp;～
+                <!--{if $arrSearchData.search_b_end_year}-->&nbsp;<!--{$arrSearchData.search_b_end_year}-->年<!--{$arrSearchData.search_b_end_month}-->月<!--{$arrSearchData.search_b_end_day}-->日<!--{/if}-->
+            <!--{else}-->(未指定)<!--{/if}-->
             </td>
         </tr>
@@ -97,4 +83,12 @@
             <th>メールアドレス</th>
             <td><!--{$arrSearchData.search_email|default:"(未指定)"|h}--></td>
+        </tr>
+        <tr>
+            <th>携帯メールアドレス</th>
+            <td><!--{$arrSearchData.search_email_mobile|default:"(未指定)"|h}--></td>
+        </tr>
+        <tr>
+            <th>電話番号</th>
+            <td><!--{$arrSearchData.search_tel|default:"(未指定)"|h}--></td>
         </tr>
         <tr>
@@ -110,14 +104,19 @@
         </tr>
         <tr>
-            <th>生年月日</th>
+            <th>購入金額</th>
             <td>
-            <!--{if $arrSearchData.search_b_start_year}-->
-                <!--{$arrSearchData.search_b_start_year}-->年<!--{$arrSearchData.search_b_start_month}-->月<!--{$arrSearchData.search_b_start_day}-->日&nbsp;～
-                <!--{if $arrSearchData.search_b_end_year}-->&nbsp;<!--{$arrSearchData.search_b_end_year}-->年<!--{$arrSearchData.search_b_end_month}-->月<!--{$arrSearchData.search_b_end_day}-->日<!--{/if}-->
-            <!--{else}-->(未指定)<!--{/if}-->
+                <!--{if $arrSearchData.search_buy_total_from == null}-->(未指定)<!--{else}--><!--{$arrSearchData.search_buy_total_from|h}-->円<!--{/if}--> ～ 
+                <!--{if $arrSearchData.search_buy_total_to == null}-->(未指定)<!--{else}--><!--{$arrSearchData.search_buy_total_to|h}-->円<!--{/if}-->
             </td>
-        </tr>    
+        </tr>
         <tr>
-            <th>登録日</th>
+            <th>購入回数</th>
+            <td>
+                <!--{if $arrSearchData.search_buy_times_from == null}-->(未指定)<!--{else}--><!--{$arrSearchData.search_buy_times_from|h}-->回<!--{/if}--> ～ 
+                <!--{if $arrSearchData.search_buy_times_to == null}-->(未指定)<!--{else}--><!--{$arrSearchData.search_buy_times_to|h}-->回<!--{/if}-->
+            </td>
+        </tr>
+        <tr>
+            <th>登録・更新日</th>
             <td>
             <!--{if $arrSearchData.search_start_year}-->
@@ -139,4 +138,8 @@
             <th>購入商品名</th>
             <td><!--{$arrSearchData.search_buy_product_name|default:"(未指定)"|h}--></td>
+        </tr>
+        <tr>
+            <th>購入商品コード</th>
+            <td><!--{$arrSearchData.search_buy_product_code|default:"(未指定)"|h}--></td>
         </tr>
         <tr>