diff --git a/bbs/write_comment_update.php b/bbs/write_comment_update.php
index dddbff657..78b49cdb0 100644
--- a/bbs/write_comment_update.php
+++ b/bbs/write_comment_update.php
@@ -218,20 +218,17 @@ if ($w == 'c') // 댓글 입력
         // 최고관리자에게 보내는 메일
         if ($config['cf_email_wr_super_admin']) $array_email[] = $super_admin['mb_email'];
 
-        // 옵션에 메일받기가 체크되어 있고, 게시자의 메일이 있다면
-        if (strstr($wr['wr_option'], 'mail') && $wr['wr_email']) {
-            // 원글 메일발송에 체크가 되어 있다면
-            if ($config['cf_email_wr_write']) $array_email[] = $wr['wr_email'];
+        // 원글게시자에게 보내는 메일
+        if ($config['cf_email_wr_write']) $array_email[] = $wr['wr_email'];
 
-            // 댓글 쓴 모든이에게 메일 발송이 되어 있다면 (자신에게는 발송하지 않는다)
-            if ($config['cf_email_wr_comment_all']) {
-                $sql = " select distinct wr_email from {$write_table}
-                            where wr_email not in ( '{$wr['wr_email']}', '{$member['mb_email']}', '' )
-                            and wr_parent = '$wr_id' ";
-                $result = sql_query($sql);
-                while ($row=sql_fetch_array($result))
-                    $array_email[] = $row['wr_email'];
-            }
+        // 댓글 쓴 모든이에게 메일 발송이 되어 있다면 (자신에게는 발송하지 않는다)
+        if ($config['cf_email_wr_comment_all']) {
+            $sql = " select distinct wr_email from {$write_table}
+                        where wr_email not in ( '{$wr['wr_email']}', '{$member['mb_email']}', '' )
+                        and wr_parent = '$wr_id' ";
+            $result = sql_query($sql);
+            while ($row=sql_fetch_array($result))
+                $array_email[] = $row['wr_email'];
         }
 
         // 중복된 메일 주소는 제거
diff --git a/bbs/write_update.php b/bbs/write_update.php
index 9ac58e347..0b71d3306 100644
--- a/bbs/write_update.php
+++ b/bbs/write_update.php
@@ -604,22 +604,18 @@ if (!($w == 'u' || $w == 'cu') && $config['cf_email_use'] && $board['bo_use_emai
     // 최고관리자에게 보내는 메일
     if ($config['cf_email_wr_super_admin']) $array_email[] = $super_admin['mb_email'];
 
-    // 옵션에 메일받기가 체크되어 있고, 게시자의 메일이 있다면
-    if (strstr($wr['wr_option'], 'mail') && $wr['wr_email']) {
-        // 원글 메일발송에 체크가 되어 있다면
-        if ($config['cf_email_wr_write']) $array_email[] = $wr['wr_email'];
+    // 원글게시자에게 보내는 메일
+    if ($config['cf_email_wr_write']) {
+        if($w == '')
+            $wr['wr_email'] = $wr_email;
 
-        // 코멘트 쓴 모든이에게 메일 발송이 되어 있다면 (자신에게는 발송하지 않는다)
-        if ($config['cf_email_wr_comment_all']) {
-            $sql = " select distinct wr_email from {$write_table}
-                        where wr_email not in ( '{$wr['wr_email']}', '{$member['mb_email']}', '' )
-                                  and wr_parent = '{$wr_id}' ";
-            $result = sql_query($sql);
-            while ($row=sql_fetch_array($result))
-                $array_email[] = $row['wr_email'];
-        }
+        $array_email[] = $wr['wr_email'];
     }
 
+    // 옵션에 메일받기가 체크되어 있고, 게시자의 메일이 있다면
+    if (strstr($wr['wr_option'], 'mail') && $wr['wr_email'])
+        $array_email[] = $wr['wr_email'];
+
     // 중복된 메일 주소는 제거
     $unique_email = array_unique($array_email);
     $unique_email = array_values($unique_email);
diff --git a/css/default.css b/css/default.css
index e82bcebe1..9a9b550ca 100644
--- a/css/default.css
+++ b/css/default.css
@@ -25,29 +25,31 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline}
 /* 상단 레이아웃 */
 #hd {z-index:10;position:relative;min-width:970px;background:#fff}
 #hd_h1 {position:absolute;font-size:0;line-height:0;overflow:hidden}
-#hd_wrapper {position:relative;margin:0 auto;width:970px}
+#hd_wrapper {position:relative;margin:0 auto;padding:26px 0;width:970px;zoom:1}
+#hd_wrapper:after {display:block;visibility:hidden;clear:both;content:""}
 
-#logo {padding:26px 0}
+#logo {float:left;padding:5px 0 0}
 
 /* 전체 검색 */
-#hd_sch {position:absolute;top:22px;left:170px;margin:0;padding:0;border:1px solid #c3c6ca}
+#hd_sch {float:left;margin:0 0 0 20px;padding:0;border:1px solid #c3c6ca}
 #hd_sch legend {position:absolute;margin:0;padding:0;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden}
 #hd_sch #sch_stx {padding-left:5px;width:110px;height:24px;border:0;background:#fff;line-height:1.9em !important;line-height:1.6em}
 #hd_sch #sch_submit {padding:0 5px;height:26px;border:0;background:#e2e6eb;color:#333;cursor:pointer}
 
-#tnb {position:absolute;top:18px;right:0;margin:0;padding:0;list-style:none;zoom:1}
-#tnb:after {display:block;visibility:hidden;clear:both;content:""}
-#tnb li {float:left;margin:0 0 0 10px}
-#tnb a {display:inline-block;padding:5px 10px;color:#333;letter-spacing:-0.1em;line-height:2em}
-#tnb a:focus, #tnb a:hover, #tnb a:active {text-decoration:none}
-#tnb img {margin-right:3px}
-
 /* 텍스트 크기 조절 */
-#text_size {position:absolute;top:21px;left:340px;margin:0 0 10px;letter-spacing:-3px}
-#text_size button {margin:0;padding:2px 2px 1px;border:1px solid #c3c6ca;background:transparent;vertical-align:middle;cursor:pointer}
+#text_size {float:left;margin:0 0 0 10px;letter-spacing:-3px}
+#text_size button {margin:0;padding:1px 2px;border:1px solid #c3c6ca;background:transparent;vertical-align:middle;cursor:pointer}
 .ts_up {font-size:1.167em !important}
 .ts_up2 {font-size:1.3em !important}
 
+/* 상단 회원가입 등 링크 */
+#tnb {float:right;margin:0;padding:0;list-style:none;zoom:1}
+#tnb:after {display:block;visibility:hidden;clear:both;content:""}
+#tnb li {float:left;margin:0 0 0 10px}
+#tnb a {display:inline-block;padding:0 10px;height:28px;color:#333;letter-spacing:-0.1em;line-height:2.4em}
+#tnb a:focus, #tnb a:hover, #tnb a:active {text-decoration:none}
+#tnb img {margin-right:3px}
+
 /* gnb js off */
 #gnb {position:relative;margin:-1px 0 0;border-top:1px dotted #dde4e9;border-bottom:1px solid #dde4e9;background:#ecf0f7}
 #gnb h2 {position:absolute;font-size:0;line-height:0;overflow:hidden}
diff --git a/head.php b/head.php
index 5a18ce906..1bb7a7cc2 100644
--- a/head.php
+++ b/head.php
@@ -74,6 +74,13 @@ if (G5_IS_MOBILE) {
             </script>
         </fieldset>
 
+        <div id="text_size">
+            <!-- font_resize('엘리먼트id', '제거할 class', '추가할 class'); -->
+            <button id="size_down" onclick="font_resize('container', 'ts_up ts_up2', '');"><img src="<?php echo G5_URL; ?>/img/ts01.gif" alt="기본"></button>
+            <button id="size_def" onclick="font_resize('container', 'ts_up ts_up2', 'ts_up');"><img src="<?php echo G5_URL; ?>/img/ts02.gif" alt="크게"></button>
+            <button id="size_up" onclick="font_resize('container', 'ts_up ts_up2', 'ts_up2');"><img src="<?php echo G5_URL; ?>/img/ts03.gif" alt="더크게"></button>
+        </div>
+
         <ul id="tnb">
             <?php if ($is_member) {  ?>
             <?php if ($is_admin) {  ?>
@@ -93,13 +100,6 @@ if (G5_IS_MOBILE) {
             <li><a href="<?php echo G5_SHOP_URL ?>/">쇼핑몰</a></li>
             <?php } ?>
         </ul>
-
-        <div id="text_size">
-            <!-- font_resize('엘리먼트id', '제거할 class', '추가할 class'); -->
-            <button id="size_down" onclick="font_resize('container', 'ts_up ts_up2', '');"><img src="<?php echo G5_URL; ?>/img/ts01.gif" alt="기본"></button>
-            <button id="size_def" onclick="font_resize('container', 'ts_up ts_up2', 'ts_up');"><img src="<?php echo G5_URL; ?>/img/ts02.gif" alt="크게"></button>
-            <button id="size_up" onclick="font_resize('container', 'ts_up ts_up2', 'ts_up2');"><img src="<?php echo G5_URL; ?>/img/ts03.gif" alt="더크게"></button>
-        </div>
     </div>
 
     <hr>
diff --git a/mobile/skin/member/basic/style.css b/mobile/skin/member/basic/style.css
index e23da9c93..bac7dcbd4 100644
--- a/mobile/skin/member/basic/style.css
+++ b/mobile/skin/member/basic/style.css
@@ -103,7 +103,7 @@
 
 /* 아이디/비밀번호 찾기 */
 #find_info #info_fs {margin:0 20px 10px}
-#find_info #info_fs p {padding:0 0 10px}
+#find_info #info_fs p {margin:0 0 10px;line-height:1.8em}
 #find_info #info_fs #mb_email {width:100%}
 #find_info #captcha {margin:0 20px;padding:0 0 10px}
 #find_info #captcha input {margin-left:5px}
diff --git a/skin/member/basic/style.css b/skin/member/basic/style.css
index ba15d7c44..6d8ca2cb6 100644
--- a/skin/member/basic/style.css
+++ b/skin/member/basic/style.css
@@ -111,6 +111,8 @@
 /* 아이디/비밀번호 찾기 */
 #find_info #mb_hp_label {display:inline-block;margin-left:10px}
 #find_info #info_fs {margin:0 20px 20px;padding:0;background:#fff}
+#find_info #info_fs .frm_input {width:70%}
+#find_info p {margin:0 0 10px;line-height:1.8em}
 #find_info #captcha {margin:0 20px}
 
 /* 로그인 */