diff --git a/bbs/ajax.autosave.php b/bbs/ajax.autosave.php
index 8adbd21e2..f497d0bb1 100644
--- a/bbs/ajax.autosave.php
+++ b/bbs/ajax.autosave.php
@@ -6,8 +6,6 @@ if (!$is_member) die('0');
 $uid     = escape_trim($_REQUEST['uid']);
 $subject = escape_trim(stripslashes($_REQUEST['subject']));
 $content = escape_trim(stripslashes($_REQUEST['content']));
-//$subject = escape_trim(htmlentities($_REQUEST['subject'], ENT_QUOTES));
-//$content = escape_trim($_REQUEST['content']);
 
 if ($subject && $content) {
     $sql = " select count(*) as cnt from {$g4['autosave_table']} where mb_id = '{$member['mb_id']}' and as_subject = '$subject' and as_content = '$content' ";
diff --git a/bbs/ajax.autosavedel.php b/bbs/ajax.autosavedel.php
new file mode 100644
index 000000000..30395b04d
--- /dev/null
+++ b/bbs/ajax.autosavedel.php
@@ -0,0 +1,15 @@
+<?php
+include_once("./_common.php");
+
+if (!$is_member) die("0");
+
+$as_id = (int)$_REQUEST['as_id'];
+
+$sql = " delete from {$g4['autosave_table']} where mb_id = '{$member['mb_id']}' and as_id = {$as_id} ";
+$result = sql_query($sql);
+if (!$result) {
+    echo "-1";
+}
+
+echo autosave_count($member['mb_id']);
+?>
\ No newline at end of file
diff --git a/bbs/ajax.autosavelist.php b/bbs/ajax.autosavelist.php
index c0b9871c3..68b214e75 100644
--- a/bbs/ajax.autosavelist.php
+++ b/bbs/ajax.autosavelist.php
@@ -3,14 +3,19 @@ include_once('./_common.php');
 
 if (!$is_member) die('');
 
-$sql = " select as_id, as_subject, as_datetime from {$g4['autosave_table']} where mb_id = '{$member['mb_id']}' order by as_id desc ";
+$sql = " select as_id, as_uid, as_subject, as_datetime from {$g4['autosave_table']} where mb_id = '{$member['mb_id']}' order by as_id desc ";
 $result = sql_query($sql);
-$arr = array();
+echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n";
+echo "<list>\n";
 for ($i=0; $row=sql_fetch_array($result); $i++) {
-    //$subject  = utf8_strcut(stripslashes($row['as_subject']), 25);
     $subject  = htmlspecialchars(utf8_strcut($row['as_subject'], 25), ENT_QUOTES);
     $datetime = substr($row['as_datetime'],2,14);
-    $arr[] = "{\"id\": \"{$row['as_id']}\", \"subject\": \"{$subject}\", \"datetime\": \"{$datetime}\"}";
+    echo "<item>\n";
+    echo "<id>{$row['as_id']}</id>\n";
+    echo "<uid>{$row['as_uid']}</uid>\n";
+    echo "<subject><![CDATA[{$subject}]]></subject>\n";
+    echo "<datetime>{$datetime}</datetime>\n";
+    echo "</item>\n";
 }
-echo "{\"autosave\":[".implode(", ", $arr)."]}";
+echo "</list>";
 ?>
\ No newline at end of file
diff --git a/bbs/ajax.autosaveload.php b/bbs/ajax.autosaveload.php
index 1cf047765..2d90ab45c 100644
--- a/bbs/ajax.autosaveload.php
+++ b/bbs/ajax.autosaveload.php
@@ -7,9 +7,12 @@ $as_id = (int)$_REQUEST['as_id'];
 
 $sql = " select as_subject, as_content from {$g4['autosave_table']} where mb_id = '{$member['mb_id']}' and as_id = {$as_id} ";
 $row = sql_fetch($sql);
-//$subject = stripslashes($row['as_subject']);
-//$content = stripslashes($row['as_content']);
-$subject = str_replace("\'", "\\\'", addslashes($row['as_subject']));
-$content = stripslashes($row['as_content']);
-echo "{\"subject\":\"{$subject}\", \"content\":\"{$content}\"}";
+$subject = $row['as_subject'];
+$content = $row['as_content'];
+
+echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n";
+echo "<item>\n";
+echo "<subject><![CDATA[{$subject}]]></subject>\n";
+echo "<content><![CDATA[{$content}]]></content>\n";
+echo "</item>\n";
 ?>
\ No newline at end of file
diff --git a/skin/board/basic/write.skin.php b/skin/board/basic/write.skin.php
index 57f4e62b4..5f60e0dcf 100644
--- a/skin/board/basic/write.skin.php
+++ b/skin/board/basic/write.skin.php
@@ -234,8 +234,8 @@ function fwrite_submit(f)
 <script>
 <?php if ($is_member) { ?>
 // 글의 제목과 내용을 저장하는 변수
-var save_wr_subject = "";
-var save_wr_content = "";
+var save_wr_subject = null;
+var save_wr_content = null;
 function autosave() {
     $("form#fwrite").each(function() {
         if (typeof(CKEDITOR.instances.wr_content)!="undefined")
@@ -265,47 +265,62 @@ function autosave() {
 setInterval(autosave, 1 * 1000);
 
 $(function(){
+    // 임시저장된 글목록을 가져옴
     $("#btn_autosave").click(function(){
         if ($("#autosave_pop").is(":hidden")) {
             $.get(g4_bbs_url+"/ajax.autosavelist.php", function(data){
-                //<li><a href="#none" class="autosave_load">저장제목</a><span>일시 <button type="button" class="autosave_del">삭제</button></span></li>
-                //console.log( "JSON Data: " + data );
+                //alert(data);
+                //console.log( "Data: " + data);
                 $("#autosave_pop ul").empty();
-                $.each(data.autosave, function(i, as) { 
-                    $("#autosave_pop ul").append('<li class="autosave_load"><a href="#none">'+as.subject+'</a><span>'+as.datetime+' <button type="button" class="autosave_del">삭제</button></span></li>');
-                    $.data(document.body, "autosave_load"+i, as.id);
-                });
-            }, "json");
+                if ($(data).find("list").find("item").length > 0) {
+                    $(data).find("list").find("item").each(function(i) { 
+                        var id = $(this).find("id").text();
+                        var uid = $(this).find("uid").text();
+                        var subject = $(this).find("subject").text();
+                        var datetime = $(this).find("datetime").text();
+                        $("#autosave_pop ul").append('<li><a href="#none" class="autosave_load">'+subject+'</a><span>'+datetime+' <button type="button" class="autosave_del">삭제</button></span></li>');
+                        $.data(document.body, "autosave_id"+i, id);
+                        $.data(document.body, "autosave_uid"+i, uid);
+                    });
+                }
+            }, "xml");
             $("#autosave_pop").show();
         } else {
             $("#autosave_pop").hide();
         }
     });
 
-    $(".autosave_close").click(function(){ $("#autosave_pop").hide(); });
-
+    // 임시저장된 글 제목과 내용을 가져와서 제목과 내용 입력박스에 노출해 줌
     $(".autosave_load").live("click", function(){
-        var as_id = $.data(document.body, "autosave_load"+$(this).index());
+        var i = $(this).parents("li").index();
+        var as_id = $.data(document.body, "autosave_id"+i);
+        var as_uid = $.data(document.body, "autosave_uid"+i);
+        $("#fwrite input[name='uid']").val(as_uid);
         $.get(g4_bbs_url+"/ajax.autosaveload.php", {"as_id":as_id}, function(data){
-            //console.log( "JSON Data: " + data );
-            $("#wr_subject").val(data.subject.replace(/\\\'/g, "'"));
+            var subject = $(data).find("item").find("subject").text();
+            var content = $(data).find("item").find("content").text();
+            $("#wr_subject").val(subject);
             if (typeof(CKEDITOR.instances.wr_content)!="undefined") {
-                CKEDITOR.instances.wr_content.setData(data.content);
+                CKEDITOR.instances.wr_content.setData(content);
             }
-        }, "json");
+        }, "xml");
         $("#autosave_pop").hide();
     });
-});
 
+    $(".autosave_del").live("click", function(){
+        var i = $(this).parents("li").index();
+        var as_id = $.data(document.body, "autosave_id"+i);
+        $.get(g4_bbs_url+"/ajax.autosavedel.php", {"as_id":as_id}, function(data){ 
+            if (data == -1) {
+                alert("임시 저장된글을 삭제중에 오류가 발생하였습니다.");
+            } else {
+                $("#autosave_count").html(data);    
+                $("#autosave_pop ul > li").eq(i).remove();
+            }
+        });
+    });
 
-/*
-$(document).click(function() {
-    $("#autosave_pop").hide();
+    $(".autosave_close").click(function(){ $("#autosave_pop").hide(); });
 });
-
-$(document).focusin(function() {
-    $("#autosave_pop").hide();
-});
-*/
 <?php } ?>
 </script>