diff --git a/admin/manage-pages.php b/admin/manage-pages.php
index 32be4535..a9a7f057 100644
--- a/admin/manage-pages.php
+++ b/admin/manage-pages.php
@@ -63,13 +63,13 @@ $stat = Typecho_Widget::widget('Widget_Stat');
                                 <a href="<?php $options->adminUrl('write-page.php?cid=' . $pages->cid); ?>"><?php $pages->title(); ?></a>
                                 <?php 
                                 if ($pages->hasSaved || 'page_draft' == $pages->type) {
-                                    echo '<em>(' . _t('草稿') . ')</em>';
+                                    echo '<em class="status">' . _t('草稿') . '</em>';
                                 } else if ('waiting' == $pages->status) {
-                                    echo '<em>(' . _t('待审核') . ')</em>';
+                                    echo '<em class="status">' . _t('待审核') . '</em>';
                                 } else if ('private' == $pages->status) {
-                                    echo '<em>(' . _t('私密') . ')</em>';
+                                    echo '<em class="status">' . _t('私密') . '</em>';
                                 } else if ($pages->password) {
-                                    echo '<em>(' . _t('密码保护') . ')</em>';
+                                    echo '<em class="status">' . _t('密码保护') . '</em>';
                                 }
                                 ?>
                                 <?php if ('page_draft' != $pages->type): ?>
diff --git a/var/Widget/Contents/Post/Admin.php b/var/Widget/Contents/Post/Admin.php
index fdb286bd..80621d33 100644
--- a/var/Widget/Contents/Post/Admin.php
+++ b/var/Widget/Contents/Post/Admin.php
@@ -61,8 +61,8 @@ class Widget_Contents_Post_Admin extends Widget_Abstract_Contents
     {
         $savedPost = $this->db->fetchRow($this->db->select('cid', 'modified')
         ->from('table.contents')
-        ->where('table.contents.parent = ? AND table.contents.type = ?',
-            $this->cid, 'post_draft')
+        ->where('table.contents.parent = ? AND (table.contents.type = ? OR table.contents.type = ?)',
+            $this->cid, 'post_draft', 'page_draft')
         ->limit(1));
         
         if ($savedPost) {
diff --git a/var/Widget/Contents/Post/Edit.php b/var/Widget/Contents/Post/Edit.php
index c0bc161e..116d13c7 100644
--- a/var/Widget/Contents/Post/Edit.php
+++ b/var/Widget/Contents/Post/Edit.php
@@ -63,8 +63,8 @@ class Widget_Contents_Post_Edit extends Widget_Abstract_Contents implements Widg
                 return $this->row;
             } else {
                 return $this->db->fetchRow($this->widget('Widget_Abstract_Contents')->select()
-                ->where('table.contents.parent = ? AND table.contents.type = ?',
-                    $this->cid, 'post_draft')
+                ->where('table.contents.parent = ? AND (table.contents.type = ? OR table.contents.type = ?)',
+                    $this->cid, 'post_draft', 'page_draft')
                 ->limit(1), array($this->widget('Widget_Abstract_Contents'), 'filter'));
             }
         }
@@ -178,7 +178,9 @@ class Widget_Contents_Post_Edit extends Widget_Abstract_Contents implements Widg
     {
         /** 发布内容, 检查是否具有直接发布的权限 */
         if ($this->user->pass('editor', true)) {
-            if ('password' == $contents['visibility'] || !in_array($contents['visibility'], array('private', 'waiting', 'publish'))) {
+            if (empty($contents['visibility'])) {
+                $contents['status'] = 'publish';
+            } else if ('password' == $contents['visibility'] || !in_array($contents['visibility'], array('private', 'waiting', 'publish'))) {
                 if (empty($contents['password']) || 'password' != $contents['visibility']) {
                     $contents['password'] = '';
                 }
@@ -248,7 +250,9 @@ class Widget_Contents_Post_Edit extends Widget_Abstract_Contents implements Widg
     {
         /** 发布内容, 检查是否具有直接发布的权限 */
         if ($this->user->pass('editor', true)) {
-            if ('password' == $contents['visibility'] || !in_array($contents['visibility'], array('private', 'waiting', 'publish'))) {
+            if (empty($contents['visibility'])) {
+                $contents['status'] = 'publish';
+            } else if ('password' == $contents['visibility'] || !in_array($contents['visibility'], array('private', 'waiting', 'publish'))) {
                 if (empty($contents['password']) || 'password' != $contents['visibility']) {
                     $contents['password'] = '';
                 }