diff --git a/addons/member_extra_info/member_extra_info.addon.php b/addons/member_extra_info/member_extra_info.addon.php
index 081f30d24..47ab98c04 100644
--- a/addons/member_extra_info/member_extra_info.addon.php
+++ b/addons/member_extra_info/member_extra_info.addon.php
@@ -32,8 +32,8 @@
         // 1. 출력문서중에서 <div class="member_번호">content</div>를 찾아 MemberController::transImageName() 를 이용하여 이미지이름/마크로 변경
         $output = preg_replace_callback('!<div([^\>]*)member_([0-9]*)([^\>]*)>(.*?)\<\/div\>!is', array($oMemberController, 'transImageName'), $output);
 
-        // 2. 출력문서중에 <div class="document_번호">내용</div> 를 찾아서 member_controller::transSignature()를 이용해서 서명을 추가
-        $output = preg_replace_callback('!<div([^\>]*)after_document_([0-9]*)([^\>]*)>(.*?)\<\/div\>!is', array($oMemberController, 'transSignature'), $output);
+        // 2. 출력문서중에 <!--AfterDocument(문서번호,회원번호)--> 를 찾아서 member_controller::transSignature()를 이용해서 서명을 추가
+        $output = preg_replace_callback('/<!--AfterDocument\(([0-9]+),([0-9]+)\)-->/i', array($oMemberController, 'transSignature'), $output);
 
     /**
      * 3 기능 수행 : 시작할때 새쪽지가 왔는지 검사
diff --git a/modules/board/skins/default/view_document.html b/modules/board/skins/default/view_document.html
index 1216ffc54..90d73c386 100644
--- a/modules/board/skins/default/view_document.html
+++ b/modules/board/skins/default/view_document.html
@@ -41,7 +41,7 @@
     </tr>
     <tr>
         <th>{$lang->content}</th>
-        <td height="100" valign="top"><div class="document_{$document->member_srl}">{$document->content}</div><div class="after_document_{$document->member_srl}"></div></td>
+        <td height="100" valign="top">{$document->content}</td>
     </tr>
     <tr>
         <th>{$lang->document_url}</th>
diff --git a/modules/document/document.model.php b/modules/document/document.model.php
index 40ec4a4a5..ec7591f72 100644
--- a/modules/document/document.model.php
+++ b/modules/document/document.model.php
@@ -71,6 +71,8 @@
                 $file_list = $oFileModel->getFiles($document_srl, $is_admin);
                 $document->uploaded_list = $file_list;
             }
+
+            $document->content = sprintf('<!--BeforeDocument(%d,%d)-->%s<!--AfterDocument(%d,%d)-->', $document_srl, $document->member_srl, $document->content, $document_srl, $document->member_srl);
             
             return $document;
         }
diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index bcdd24743..e8c1c675f 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -1296,7 +1296,6 @@
          **/
         function transSignature($matches) {
             $member_srl = $matches[2];
-            $text = $matches[4];
             if(!$member_srl) return $matches[0];
 
             // 전역변수에 미리 설정한 데이터가 있다면 그걸 return