diff --git a/chaika/chrome/content/chaika/bbsmenu/page.js b/chaika/chrome/content/chaika/bbsmenu/page.js
index 2e89d3c1..d82d9930 100644
--- a/chaika/chrome/content/chaika/bbsmenu/page.js
+++ b/chaika/chrome/content/chaika/bbsmenu/page.js
@@ -50,6 +50,7 @@ var Page = {
         var browser = ChaikaCore.browser.getBrowserWindow();
         if(browser && browser.document.getElementById("viewFoxAge2chSidebar")){
             document.getElementById("viewFoxAge2chMenu").hidden = false;
+            document.getElementById('viewFoxAge2chMenu-separator').hidden = false;
         }
     },
 
@@ -244,7 +245,8 @@ var SearchBox = {
         Notification.removeAll();
         Notification.info('検索中');
 
-        let promise = ChaikaSearch.getPlugin(this.getSearchMode()).search(aSearchStr);
+        let plugin = ChaikaSearch.getPlugin(this.getSearchMode());
+        let promise = plugin.search(ChaikaCore.io.escapeHTML(aSearchStr));
 
         promise.then(this._showResults, this._onError)
                .then(null, this._onError);
@@ -258,7 +260,9 @@ var SearchBox = {
 
         results.forEach((board) => {
             let boardItem = document.createElement('board');
-            boardItem.setAttribute('title', board.title);
+            let boardTitle = ChaikaCore.io.unescapeHTML(board.title);
+
+            boardItem.setAttribute('title', boardTitle);
             boardItem.setAttribute('url', board.url || '');
             boardItem.setAttribute('type', board.type || ChaikaBoard.BOARD_TYPE_PAGE);
 
@@ -270,9 +274,15 @@ var SearchBox = {
 
                 board.threads.forEach((thread) => {
                     let threadItem = document.createElement('thread');
+                    let threadTitle = ChaikaCore.io.unescapeHTML(thread.title);
+
+                    if(thread.post){
+                        threadTitle += ' [' + thread.post + ']';
+                    }
+
                     threadItem.setAttribute('url', thread.url);
-                    threadItem.setAttribute('title', thread.title + ' [' + (thread.post || '-') + ']');
-                    threadItem.setAttribute('boardName', board.title);
+                    threadItem.setAttribute('title', threadTitle);
+                    threadItem.setAttribute('boardName', boardTitle);
 
                     boardItem.appendChild(threadItem);
                 });
diff --git a/chaika/chrome/content/chaika/bbsmenu/page.xul b/chaika/chrome/content/chaika/bbsmenu/page.xul
index 964c40d0..d0c8da12 100644
--- a/chaika/chrome/content/chaika/bbsmenu/page.xul
+++ b/chaika/chrome/content/chaika/bbsmenu/page.xul
@@ -7,70 +7,89 @@
 <?xml-stylesheet href="chrome://chaika/skin/bbsmenu/page.css" type="text/css"?>
 
 
-<page id="bookmarksPanel" title="BBSMENU [chaika]" class="bbsmenuPage"
-        onload="Page.startup()" onunload="Page.shutdown()"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+<page id="bookmarksPanel"
+      title="BBSMENU [chaika]"
+      class="bbsmenuPage"
+      onload="Page.startup()"
+      onunload="Page.shutdown()"
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-<script type="application/javascript" src="chrome://global/content/nsDragAndDrop.js"/>
-<script type="application/javascript" src="chrome://chaika/content/bbsmenu/page.js"/>
+<script type="application/javascript" src="chrome://global/content/nsDragAndDrop.js" />
+<script type="application/javascript" src="chrome://chaika/content/bbsmenu/page.js" />
 
 <popupset>
     <menupopup id="searchModeMenu" />
 
     <menupopup id="historyMenuContext"
-            style="-moz-binding:url(chrome://chaika/content/pageUtils.xml#itemContext)"/>
+               style="-moz-binding:url(chrome://chaika/content/pageUtils.xml#itemContext)" />
 
     <menupopup id="treeContextMenu"
-            style="-moz-binding:url(chrome://chaika/content/pageUtils.xml#itemContext)"
-            onpopupshowing="return Tree.showContext(event)"/>
+               style="-moz-binding:url(chrome://chaika/content/pageUtils.xml#itemContext)"
+               onpopupshowing="return Tree.showContext(event)" />
 </popupset>
 
 <hbox align="center">
-    <textbox id="searchBox" value="" emptytext="" flex="1" type="search" timeout="2000"
-            oncommand="if(this.value === '') SearchBox.search('')"
-            onkeypress="if(event.keyCode == KeyEvent.DOM_VK_RETURN) SearchBox.search(this.value)">
-        <box><dropmarker popup="searchModeMenu" class="plain"/></box>
+    <textbox id="searchBox"
+             value=""
+             emptytext=""
+             flex="1"
+             type="search"
+             timeout="2000"
+             oncommand="if(this.value === '') SearchBox.search('')"
+             onkeypress="if(event.keyCode == KeyEvent.DOM_VK_RETURN) SearchBox.search(this.value)">
+        <box>
+            <dropmarker popup="searchModeMenu" class="plain" />
+        </box>
     </textbox>
 
     <menubar id="mainMenubar" class="plain">
         <menu id="historyMenu" label="履歴" class="plain menu-iconic">
             <menupopup style="-moz-binding:url(chrome://chaika/content/pageUtils.xml#historyMenuPopup)"
-                    position="after_end" tooltiptext=""
-                    itemContext="historyMenuContext"/>
+                       position="after_end"
+                       tooltiptext=""
+                       itemContext="historyMenuContext" />
         </menu>
 
         <menu id="toolsMenu" label="ツール" class="plain menu-iconic">
             <menupopup id="toolsMenuPopup" position="after_end">
-                <menuitem label="bbsmenu 更新" oncommand="BbsmenuUpdater.update()"/>
-                <menuseparator/>
-                <menuitem label="ログマネージャ" oncommand="Page.openLogManager()"/>
-                <menuitem label="データフォルダを開く" oncommand="Page.openDataFolder()"/>
-                <menuitem label="FoxAge2ch" id="viewFoxAge2chMenu"
-                         hidden="true" oncommand="Page.viewFoxAge2ch()"/>
-                <menu label="ヘルプ">
-                    <menupopup>
-                        <menuitem label="リリースノート" oncommand="Page.openReleaseNotes()"/>
-                        <menuitem label="トラブルシューティング情報" oncommand="Page.openSupport()"/>
-                        <menuitem label="オンラインヘルプ" oncommand="Page.openOnlineHelp()"/>
-                    </menupopup>
-                </menu>
-                <menuseparator/>
-                <menuitem label="オプション..." oncommand="Page.openSettings()"/>
+                <menuitem label="BBSMENU を更新" oncommand="BbsmenuUpdater.update()" />
+                <menuseparator />
+                <menuitem label="ログマネージャ..." oncommand="Page.openLogManager()" />
+                <menuitem label="データフォルダを開く" oncommand="Page.openDataFolder()" />
+                <menuseparator />
+                <menuitem label="リリースノート" oncommand="Page.openReleaseNotes()" />
+                <menuitem label="トラブルシューティング情報" oncommand="Page.openSupport()" />
+                <menuitem label="オンラインヘルプ" oncommand="Page.openOnlineHelp()" />
+                <menuseparator />
+                <menuitem label="FoxAge2ch を開く" id="viewFoxAge2chMenu"
+                          hidden="true" oncommand="Page.viewFoxAge2ch()" />
+                <menuseparator id="viewFoxAge2chMenu-separator" hidden="true" />
+                <menuitem label="オプション..." oncommand="Page.openSettings()" />
             </menupopup>
         </menu>
     </menubar>
 </hbox>
 
-<notificationbox id="notification"/>
+<notificationbox id="notification" />
+
+<tree id="bookmarks-view"
+      class="sidebar-placesTree bbsmenuTree"
+      hidecolumnpicker="true"
+      flex="1"
+      openedCategories=""
+      persist="openedCategories"
+      context="treeContextMenu">
 
-<tree id="bookmarks-view" class="sidebar-placesTree bbsmenuTree" hidecolumnpicker="true" flex="1"
-        openedCategories="" persist="openedCategories"
-        context="treeContextMenu">
     <treecols>
-        <treecol id="title" flex="1" primary="true" hideheader="true"/>
+        <treecol id="title" flex="1" primary="true" hideheader="true" />
     </treecols>
-    <treechildren id="bookmarks-view-children" class="sidebar-placesTreechildren" flex="1"
-            onclick="Tree.click(event)" ondblclick="Tree.click(event)"/>
+
+    <treechildren id="bookmarks-view-children"
+                  class="sidebar-placesTreechildren"
+                  flex="1"
+                  onclick="Tree.click(event)"
+                  ondblclick="Tree.click(event)" />
+
 </tree>
 
 </page>
diff --git a/chaika/chrome/content/chaika/board/page.js b/chaika/chrome/content/chaika/board/page.js
index 9b28947d..c65bae11 100644
--- a/chaika/chrome/content/chaika/board/page.js
+++ b/chaika/chrome/content/chaika/board/page.js
@@ -41,6 +41,7 @@ Components.utils.import("resource://chaika-modules/ChaikaCore.js");
 Components.utils.import("resource://chaika-modules/ChaikaBoard.js");
 Components.utils.import("resource://chaika-modules/ChaikaDownloader.js");
 Components.utils.import("resource://chaika-modules/ChaikaAboneManager.js");
+Components.utils.import("resource://chaika-modules/ChaikaContentReplacer.js");
 
 const Ci = Components.interfaces;
 const Cc = Components.classes;
@@ -263,7 +264,7 @@ var BoardTree = {
         }
 
 
-        //スレッドあぼーん処理
+        //スレッドあぼーん処理 および スレタイ置換
         var enableHideAbone = ChaikaCore.pref.getBool('thread_hide_abone');
         var threads = gBoard.itemsDoc.documentElement.getElementsByTagName('boarditem');
 
@@ -273,6 +274,8 @@ var BoardTree = {
             //透明あぼーんの影響で最後の方は参照できなくなる
             if(!thread) continue;
 
+
+            //スレッドあぼーん処理
             let hitAboneData = ChaikaAboneManager.shouldAbone({
                 title: thread.getAttribute('title'),
                 date: thread.getAttribute('created'),
@@ -296,6 +299,21 @@ var BoardTree = {
                     thread.setAttribute('title', '***** ABONE ***** (' + hitAboneData.title + ')');
                 }
             }
+
+
+            //スレタイ置換処理
+            let replacedThreadData = ChaikaContentReplacer.replace({
+                title: thread.getAttribute('title'),
+                date: thread.getAttribute('created'),
+                thread_url: thread.getAttribute('url'),
+                board_url: gBoard.url,
+                isThreadList: true,
+                isSubjectTxt: false
+            });
+
+            if(replacedThreadData){
+                thread.setAttribute('title', replacedThreadData.title);
+            }
         }
 
 
diff --git a/chaika/chrome/content/chaika/browser/browserMenu.xml b/chaika/chrome/content/chaika/browser/browserMenu.xml
index 26988165..880b4840 100644
--- a/chaika/chrome/content/chaika/browser/browserMenu.xml
+++ b/chaika/chrome/content/chaika/browser/browserMenu.xml
@@ -10,8 +10,7 @@
 
 <binding id="browserMenu" extends="chrome://global/content/bindings/popup.xml#popup">
     <content>
-        <xul:arrowscrollbox orient="vertical" flex="1">
-            <children />
+        <xul:arrowscrollbox orient="vertical" flex="1" anonid="root" class="chaika-browser-menu-root">
             <xul:menu label="あぼーん" anonid="abone">
                 <xul:menupopup>
                     <xul:menuitem label="名前" anonid="abone-name" />
@@ -87,6 +86,10 @@
             <xul:menuseparator anonid="sidebar-sep" />
 
             <xul:menuitem label="オプション..." anonid="open-settings"/>
+
+            <xul:menuseparator anonid="chaika-sep" class="chaika-shown-when-flattened" />
+
+            <children />
         </xul:arrowscrollbox>
     </content>
 
@@ -177,21 +180,28 @@
         <method name="_getPlainURL">
             <parameter name="aURI"/>
             <body><![CDATA[
-                if(!(aURI instanceof Components.interfaces.nsIURI)){
-                    aURI = Services.io.newURI(aURI, null, null).QueryInterface(Ci.nsIURI);
-                }
+                let spec = aURI instanceof Components.interfaces.nsIURI ? aURI.spec : aURI;
 
-                if(!this._isChaika(aURI)) return aURI;
+                // Google リダイレクタ対策
+                if(spec.contains('google') && spec.contains('/url?')){
+                    spec = decodeURIComponent(spec.match(/url=([^&]*)/i)[1]);
+                }
 
-                var plainURL = aURI.path.substring(1).replace(/^thread\//, "");
+                let uri = Services.io.newURI(spec, null, null).QueryInterface(Ci.nsIURI);
 
-                plainURL = plainURL.replace("/test/read.html/", "/test/read.cgi/")
-                                    .replace("/test/mread.cgi/", "/test/read.cgi/");
+                if(!this._isChaika(uri)){
+                    return uri;
+                }else{
+                    let plainURL = uri.path.substring(1)
+                                           .replace(/^thread\//, "")
+                                           .replace("/test/read.html/", "/test/read.cgi/")
+                                           .replace("/test/mread.cgi/", "/test/read.cgi/");
 
-                try{
-                    return Services.io.newURI(plainURL, null, null);
-                }catch(ex){
-                    return null;
+                    try{
+                        return Services.io.newURI(plainURL, null, null);
+                    }catch(ex){
+                        return null;
+                    }
                 }
             ]]></body>
         </method>
@@ -305,6 +315,8 @@
                 const isOnThread = this._isThread(currentURI);
                 const isOnBoard = this._isBoard(currentURI);
 
+                this.ChaikaCore.logger.debug(gContextMenu);
+
                 const isContextMenu = !!gContextMenu;
                 const isTextSelected = isContextMenu && gContextMenu.isTextSelected;
                 const isOnBBSLink = isContextMenu && gContextMenu.onLink && this._isBBS(gContextMenu.linkURL);
@@ -338,19 +350,18 @@
             <parameter name="aEvent"/>
             <parameter name="aMiddleClicked"/>
             <body><![CDATA[
-                var targetElement = aEvent.originalTarget;
-                var anonymousID = targetElement.getAttribute("anonid");
+                let targetElement = aEvent.originalTarget;
+                let anonymousID = targetElement.getAttribute("anonid");
+                let addTab = this.ChaikaCore.pref.getBool("browser.browsermenu.open_in_new_tab");
+                let disregardLimit = this.ChaikaCore.pref.getBool("browser.browsermenu.disregard_url_limit");
+                let selection = content.getSelection();
+                let selectedText = selection.toString();
+
 
-                var addTab = this.ChaikaCore.pref.getBool("browser.browsermenu.open_in_new_tab");
                 if(aMiddleClicked || aEvent.ctrlKey || aEvent.metaKey){
                     addTab = !addTab;
                 }
 
-                var disregardLimit = this.ChaikaCore.pref.getBool("browser.browsermenu.disregard_url_limit");
-
-                var selection = content.getSelection();
-                var selectedText = selection.toString();
-
 
                 switch(anonymousID){
                     case 'abone-name':
@@ -456,13 +467,20 @@
                         }
                 }
 
+
+                //メニューの項目を実行した時にサイドバー開閉コマンドが動作しないようにする
+                aEvent.stopPropagation();
+
+
                 //中クリックの場合にポップアップが閉じないのに対処する
                 if(aMiddleClicked){
                     let contextMenu = document.getElementById('contentAreaContextMenu');
                     let menupopup = this.parentNode.getElementsByTagName('menupopup')[0];
 
+                    //コンテキストメニューの場合
                     contextMenu.hidePopup();
 
+                    //ツールバーボタンの場合
                     if(menupopup){
                         menupopup.hidePopup();
                     }
diff --git a/chaika/chrome/content/chaika/browser/overlay.js b/chaika/chrome/content/chaika/browser/overlay.js
index 3cc30ff3..4446a853 100644
--- a/chaika/chrome/content/chaika/browser/overlay.js
+++ b/chaika/chrome/content/chaika/browser/overlay.js
@@ -4,7 +4,7 @@ var ChaikaBrowserOverlay = {
 
     _initCount: 0,
 
-    start: function ChaikaBrowserOverlay_start(){
+    start: function(){
         //10s待ってもChaikaCoreが初期化されていなかったら
         //初期化は失敗したものとみなす
         if(ChaikaBrowserOverlay._initCount > 100){
@@ -17,6 +17,8 @@ var ChaikaBrowserOverlay = {
             ChaikaBrowserOverlay.toolbarButton.start();
             ChaikaBrowserOverlay.aboneEvent.start();
 
+            gBrowser.addProgressListener(ChaikaBrowserOverlay.webProgress);
+
             //リリースノートの表示
             setTimeout(function(){ ChaikaBrowserOverlay._showReleaseNotes(); }, 0);
         }else{
@@ -26,11 +28,12 @@ var ChaikaBrowserOverlay = {
     },
 
 
-    stop: function ChaikaBrowserOverlay_stop(){
+    stop: function(){
         ChaikaBrowserOverlay.browserMenu.stop();
         ChaikaBrowserOverlay.contextMenu.stop();
-        ChaikaBrowserOverlay.toolbarButton.stop();
         ChaikaBrowserOverlay.aboneEvent.stop();
+
+        gBrowser.removeProgressListener(ChaikaBrowserOverlay.webProgress);
     },
 
 
@@ -38,7 +41,7 @@ var ChaikaBrowserOverlay = {
      * ブラウザ起動時のウィンドウロード後に一度だけ実行される
      * バージョン更新時にのみ自動的にリリースノートを表示する
      */
-    _showReleaseNotes: function ChaikaBrowserOverlay__showReleaseNotes(){
+    _showReleaseNotes: function(){
         //現在のバージョン
         var currentVersion = ChaikaBrowserOverlay.ChaikaAddonInfo.version;
 
@@ -51,9 +54,54 @@ var ChaikaBrowserOverlay = {
         }
     },
 
+
+    checkIvurRedirection: function(aLocation){
+        if(!aLocation.spec.startsWith('chaika://ivur/')) return;
+
+        let originalURI = aLocation.spec.replace('chaika://ivur/', '')
+                                        .replace('?dummy_ext=.jpg', '');
+
+        PopupNotifications.show(
+            gBrowser.selectedBrowser,
+            'chaika-ivur-popup',
+            'ImageViewURLReplace.dat によって書き換えられたリンク先を表示しています。元のリンク先を表示しますか？',
+            null,
+            {
+                label: '元のリンク先へ移動する',
+                accessKey: 'O',
+                callback: function(){
+                    openUILinkIn(originalURI, 'current');
+                }
+            },
+            null,
+            {
+                popupIconURL: 'chrome://chaika/content/icon.png'
+            }
+        );
+    },
+
+
+    webProgress: {
+        onLocationChange: function(aWebProgress, aRequest, aLocation){
+            setTimeout(() => {
+                ChaikaBrowserOverlay.toolbarButton.onLocationChange(aLocation);
+                ChaikaBrowserOverlay.checkIvurRedirection(aLocation);
+            }, 0);
+        },
+
+        onStateChange: function(){},
+        onProgressChange: function(){},
+        onStatusChange: function(){},
+        onSecurityChange: function(){},
+        onLinkIconAvailable: function(){},
+
+        QueryInterface: XPCOMUtils.generateQI(["nsIWebProgressListener", "nsISupportsWeakReference"])
+    }
+
 };
 
 
+Components.utils.import("resource://gre/modules/PopupNotifications.jsm");
 Components.utils.import("resource://chaika-modules/ChaikaCore.js", ChaikaBrowserOverlay);
 Components.utils.import('resource://chaika-modules/ChaikaAboneManager.js', ChaikaBrowserOverlay);
 Components.utils.import('resource://chaika-modules/ChaikaAddonInfo.js', ChaikaBrowserOverlay);
@@ -62,8 +110,7 @@ Components.utils.import('resource://chaika-modules/ChaikaAddonInfo.js', ChaikaBr
 ChaikaBrowserOverlay.browserMenu = {
 
     get _root(){
-        delete this._root;
-        return (this._root = document.getElementsByClassName('chaika-browser-menu')[0]);
+        return document.getElementsByClassName('chaika-browser-menu')[0];
     },
 
     /**
@@ -99,32 +146,31 @@ ChaikaBrowserOverlay.browserMenu = {
 
 ChaikaBrowserOverlay.contextMenu = {
 
-    start: function contextMenu_start(){
-        this._contextMenu = document.getElementById('context-chaika');
+    get _browserMenu(){
+        return this._isFlattened ? document.getElementById("contentAreaContextMenu") :
+                                   document.getElementById('context-chaika').firstChild;
+    },
 
-        let enableContextMenu = ChaikaBrowserOverlay.ChaikaCore.pref.getBool("contextmenu.enabled");
+    start: function(){
+        this._isFlattened = false;
 
-        if(enableContextMenu){
-            this._contextMenu.hidden = false;
+        if(ChaikaBrowserOverlay.ChaikaCore.pref.getBool("contextmenu.enabled")){
+            this._show();
 
-            let flattenContextMenu = ChaikaBrowserOverlay.ChaikaCore.pref.getBool('contextmenu.flattened');
-            if(flattenContextMenu){
-                this._flattenContextMenu();
+            if(ChaikaBrowserOverlay.ChaikaCore.pref.getBool('contextmenu.flattened')){
+                this._flatten();
             }
 
-            let browserContextMenu = document.getElementById("contentAreaContextMenu");
-            browserContextMenu.addEventListener("popupshowing", this, false);
+            document.getElementById("contentAreaContextMenu").addEventListener("popupshowing", this, false);
         }else{
-            this._contextMenu.hidden = true;
+            this._hide();
         }
     },
 
 
-    stop: function contextMenu_stop(){
-        this._contextMenu.hidden = true;
-
-        let browserContextMenu = document.getElementById("contentAreaContextMenu");
-        browserContextMenu.removeEventListener("popupshowing", this, false);
+    stop: function(){
+        this._hide();
+        document.getElementById("contentAreaContextMenu").removeEventListener("popupshowing", this, false);
     },
 
 
@@ -142,70 +188,79 @@ ChaikaBrowserOverlay.contextMenu = {
     /**
      * コンテキストメニューをフラットにする
      */
-    _flattenContextMenu: function contextMenu__flattenContextMenu(){
-        // Remove menu#context-chaika
-        this._contextMenu.parentNode.removeChild(this._contextMenu);
+    _flatten: function(){
+        let contextMenu = document.getElementById('context-chaika');
 
-        // Create inline menu container
-        var vbox = document.createElement('vbox');
-        vbox.setAttribute('style', '-moz-binding:url(chrome://chaika/content/browser/browserMenu.xml#browserMenu)');
+        contextMenu.parentNode.removeChild(contextMenu);
+        contextMenu.removeAttribute('id');
 
-        // Insert the container at first of the contextmenu
         var browserContextMenu = document.getElementById('contentAreaContextMenu');
-        browserContextMenu.insertBefore(vbox, browserContextMenu.firstChild);
+        browserContextMenu.setAttribute('style', '-moz-binding:url(chrome://chaika/content/browser/browserMenu.xml#browserMenu)');
 
-        // Insert a separator after the container
-        var separator = document.createElement('menuseparator');
-        browserContextMenu.insertBefore(separator, vbox.nextSibling);
+        browserContextMenu.classList.add('chaika-status-flattened');
+        this._isFlattened = true;
+    },
 
-        this._contextMenu.removeAttribute('id');
-        vbox.setAttribute('id', 'context-chaika');
 
-        this._contextMenu = document.getElementById('context-chaika');
+    /**
+     * コンテキストメニューを非表示にする
+     */
+    _hide: function(){
+        if(!this._isFlattened){
+            document.getElementById('context-chaika').hidden = true;
+        }else{
+            this._browserMenu.classList.add('chaika-status-hidden');
+        }
+    },
+
+
+    /**
+     * コンテキストメニューを表示する
+     */
+    _show: function(){
+        if(!this._isFlattened){
+            document.getElementById('context-chaika').hidden = false;
+        }else{
+            this._browserMenu.classList.remove('chaika-status-hidden');
+        }
     },
 
 
     /**
      * コンテキストメニューが表示された時に呼ばれる
      */
-    _popupShowing: function contextMenu__popupShowing(){
-        //掲示板上でのみ表示する設定の場合
-        // i) ページが掲示板上である -> 表示
-        // ii) ページが掲示板上でない
-        //     a) 設定が有効 かつ カーソルがリンク上 かつ リンク先が掲示板 -> 表示
-        //     b) それ以外の時は表示しない
+    _popupShowing: function(){
+        //掲示板上でのみ表示する設定の場合の表示・非表示
         if(ChaikaBrowserOverlay.ChaikaCore.pref.getBool('contextmenu.show_only_on_bbs')){
             if(ChaikaBrowserOverlay.browserMenu._isBBS(gBrowser.currentURI)){
-                // i)
+                // i) ページが掲示板上である -> 表示
             }else{
-                // ii)
+                // ii) ページが掲示板上でない
                 if(ChaikaBrowserOverlay.ChaikaCore.pref.getBool('contextmenu.always_show_open_link') &&
-                   gContextMenu.onLink && ChaikaBrowserOverlay.browserMenu._isBBS(gContextMenu.linkURL)){
-                           // ii) - a)
+                   gContextMenu.onLink &&
+                   ChaikaBrowserOverlay.browserMenu._isBBS(gContextMenu.linkURL)){
+                        // ii) - a)「リンク先の項目は表示する」設定が有効, カーソルがリンク上, リンク先が掲示板 -> 表示
                 }else{
-                    // ii) - b)
-                    this._contextMenu.hidden = true;
+                    // ii) - b) それ以外 -> 非表示
+                    this._hide();
                     return;
                 }
             }
         }
 
 
-        this._contextMenu.hidden = false;
+        this._show();
 
 
         //設定で非表示にされているものを非表示にする
         let prefs = Services.prefs.getBranch("extensions.chaika.contextmenu.");
         let prefNames = prefs.getChildList("", {});
-        let root = this._contextMenu.classList.contains('chaika-browser-menu') ?
-                        this._contextMenu :
-                        this._contextMenu.firstChild;
 
         prefNames.forEach((name) => {
             if(!name.endsWith('enabled')) return;
 
             var anonid = name.replace('.enabled', '');
-            var menuitem = document.getAnonymousElementByAttribute(root, 'anonid', anonid);
+            var menuitem = document.getAnonymousElementByAttribute(this._browserMenu, 'anonid', anonid);
 
             if(menuitem){
                 menuitem.hidden = !prefs.getBoolPref(name);
@@ -218,11 +273,7 @@ ChaikaBrowserOverlay.contextMenu = {
 
 ChaikaBrowserOverlay.toolbarButton = {
 
-    start: function toolbarButton_start(){
-        if(ChaikaBrowserOverlay.ChaikaCore.pref.getBool('browser.toolbarbutton.show_only_on_bbs')){
-            gBrowser.addProgressListener(ChaikaBrowserOverlay.toolbarButton.webProgress);
-        }
-
+    start: function(){
         //初回起動時にボタンを追加する
         if(!ChaikaBrowserOverlay.ChaikaCore.pref.getBool("browser.toolbarbutton.installed") &&
            !document.getElementById('chaika-toolbarbutton')){
@@ -234,50 +285,37 @@ ChaikaBrowserOverlay.toolbarButton = {
 
                 ChaikaBrowserOverlay.ChaikaCore.pref.setBool("browser.toolbarbutton.installed", true);
         }
-    },
 
-    stop: function toolbarButton_stop(){
-        try{
-            gBrowser.removeProgressListener(ChaikaBrowserOverlay.toolbarButton.webProgress);
-        }catch(ex){}
+        this._toolbarbutton = document.getElementById('chaika-toolbarbutton');
     },
 
-    webProgress: {
-        QueryInterface: XPCOMUtils.generateQI(["nsIWebProgressListener",
-                                           "nsISupportsWeakReference"]),
 
-        onLocationChange: function(aWebProgress, aRequest, aLocation){
-            setTimeout(function(){
-                document.getElementById('chaika-toolbarbutton').hidden =
-                    aLocation.spec !== 'about:customizing' &&
-                    !ChaikaBrowserOverlay.browserMenu._isBBS(aLocation.spec);
-            }, 0);
-        },
+    onLocationChange: function(aLocation){
+        if(!ChaikaBrowserOverlay.ChaikaCore.pref.getBool('browser.toolbarbutton.show_only_on_bbs')){
+            return;
+        }
 
-        onStateChange: function(){},
-        onProgressChange: function(){},
-        onStatusChange: function(){},
-        onSecurityChange: function(){},
-        onLinkIconAvailable: function(){}
+        this._toolbarbutton.hidden = aLocation.spec !== 'about:customizing' &&
+                                     !ChaikaBrowserOverlay.browserMenu._isBBS(aLocation.spec);
     }
 };
 
 
 ChaikaBrowserOverlay.aboneEvent = {
 
-    start: function aboneEvent_start(){
+    start: function(){
         Services.obs.addObserver(this, "chaika-abone-data-add", false);
         Services.obs.addObserver(this, "chaika-abone-data-remove", false);
     },
 
 
-    stop: function aboneEvent_stop(){
+    stop: function(){
         Services.obs.removeObserver(this, "chaika-abone-data-add", false);
         Services.obs.removeObserver(this, "chaika-abone-data-remove", false);
     },
 
 
-    observe: function aboneEvent_observe(aSubject, aTopic, aData){
+    observe: function(aSubject, aTopic, aData){
         let aboneType,
             legacyAboneType,  // b2r/chaika 1.6.3互換のあぼーんタイプ値
             eventType;
diff --git a/chaika/chrome/content/chaika/browser/overlay.xul b/chaika/chrome/content/chaika/browser/overlay.xul
index baead011..028085b5 100644
--- a/chaika/chrome/content/chaika/browser/overlay.xul
+++ b/chaika/chrome/content/chaika/browser/overlay.xul
@@ -3,48 +3,67 @@
 <!-- See license.txt for terms of usage -->
 
 <overlay id="ChaikaBrowserOverlay"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <script type="application/javascript" src="chrome://chaika/content/browser/overlay.js"/>
 
     <!-- PopupSet -->
     <popupset id="mainPopupSet">
-        <menupopup id="chaika-history-popup" tooltiptext=""
-            style="-moz-binding:url(chrome://chaika/content/pageUtils.xml#historyMenuPopup)"/>
+        <menupopup id="chaika-history-popup"
+                   tooltiptext=""
+                   style="-moz-binding:url(chrome://chaika/content/pageUtils.xml#historyMenuPopup)"/>
+
+        <menupopup id="chaika-browsermenu-popup"
+                   tooltiptext=""
+                   style="-moz-binding:url(chrome://chaika/content/browser/browserMenu.xml#browserMenu)" />
     </popupset>
 
     <!-- SideBar Menu -->
     <menupopup id="viewSidebarMenu">
-        <menuitem key="key_viewChaikaSidebar" observes="viewChaikaSidebar"/>
+        <menuitem key="key_viewChaikaSidebar"
+                  observes="viewChaikaSidebar"/>
     </menupopup>
 
     <!-- Open SideBar Shortcut Key -->
     <keyset id="mainKeyset">
-        <key id="key_viewChaikaSidebar" command="viewChaikaSidebar"
-            key="&quot;" modifiers="accel"/>
+        <key id="key_viewChaikaSidebar"
+             command="viewChaikaSidebar"
+             key="&quot;"
+             modifiers="accel"/>
     </keyset>
 
     <!-- Open SideBar Command -->
     <broadcasterset id="mainBroadcasterSet">
-        <broadcaster id="viewChaikaSidebar" autoCheck="false"
-            label="chaika" type="checkbox" group="sidebar"
-            sidebarurl="chrome://chaika/content/bbsmenu/page.xul"
-            sidebartitle="chaika"
-            oncommand="toggleSidebar('viewChaikaSidebar');"/>
+        <broadcaster id="viewChaikaSidebar"
+                     autoCheck="false"
+                     label="chaika"
+                     type="checkbox"
+                     group="sidebar"
+                     sidebarurl="chrome://chaika/content/bbsmenu/page.xul"
+                     sidebartitle="chaika"
+                     oncommand="toggleSidebar('viewChaikaSidebar');"/>
     </broadcasterset>
 
     <!-- Toolbar Button -->
     <toolbarpalette id="BrowserToolbarPalette">
-        <toolbarbutton id="chaika-toolbarbutton" class="toolbarbutton-1 chromeclass-toolbar-additional"
-                label="chaika" tooltiptext="chaika" type="menu">
+        <toolbarbutton id="chaika-toolbarbutton"
+                       class="toolbarbutton-1 chromeclass-toolbar-additional"
+                       label="chaika"
+                       tooltiptext="chaika"
+                       type="menu-button"
+                       contextmenu="chaika-browsermenu-popup"
+                       oncommand="toggleSidebar('viewChaikaSidebar');">
             <menupopup style="-moz-binding:url(chrome://chaika/content/browser/browserMenu.xml#browserMenu)" />
         </toolbarbutton>
     </toolbarpalette>
 
     <!-- Browser Context Menu -->
     <popup id="contentAreaContextMenu">
-        <menu id="context-chaika" label="chaika" class="menu-iconic"
-                image="chrome://chaika/content/icon.png" insertafter="context-sep-stop">
+        <menu id="context-chaika"
+              label="chaika"
+              class="menu-iconic"
+              image="chrome://chaika/content/icon.png"
+              insertafter="context-sep-stop">
             <menupopup style="-moz-binding:url(chrome://chaika/content/browser/browserMenu.xml#browserMenu)" />
         </menu>
     </popup>
diff --git a/chaika/chrome/content/chaika/defaults/defaultmail.txt b/chaika/chrome/content/chaika/defaults/defaultmail.txt
index f6c3885c..2d9a210e 100644
--- a/chaika/chrome/content/chaika/defaults/defaultmail.txt
+++ b/chaika/chrome/content/chaika/defaults/defaultmail.txt
@@ -15,9 +15,13 @@
 # �@ �\�t�g�E�F�A�‚ƌ����̃e�X�g�‚��`����ꍇ
 #
 #------------------------------------------------------------------------------
-# �� ID/�z�X�g�� [1 �ˆȏ�� TAB] ���[���A�h���X
-# ���t�@�C���̏�̕�����`�F�b�N���Ă����A�ŏ��Ƀ}�b�`�����s�̒�`���g���܂�
-# �@���̗Ⴞ�� software �‚ł́ufoobar@example.com�v�ƂȂ�܂�
+# �–� [1 �ˆȏ�� TAB] ���[���A�h���X [1 �ˆȏ�� TAB] �K�p�Ώ�
+#    - �u�–��v�ɂ� �‚�ID/�z�X�g ���w�肵�܂�
+#      �����w�肳��Ă��Ȃ��ꍇ�ɂ͑S�Ă̔‚��ΏۂƂȂ�܂�
+#    - �u�K�p�Ώہv�ɂ� all (���ׂ�), thread (�X�����Ď��̂�), post (���X���̂�) �̂����ꂩ���w�肵�܂�
+#      �����w�肳��Ă��Ȃ��ꍇ�ɂ� all ���w�肳�ꂽ���̂Ƃ݂Ȃ��܂�
+#    - �t�@�C���̏�̕�����`�F�b�N���Ă����A�ŏ��Ƀ}�b�`�����s�̒�`���g���܂�
+#      ���̗Ⴞ�� software �‚ł́ufoobar@example.com�v�ƂȂ�܂�
 #------------------------------------------------------------------------------
 #
 #software	foobar@example.com
diff --git a/chaika/chrome/content/chaika/defaults/defaultname.txt b/chaika/chrome/content/chaika/defaults/defaultname.txt
index b784c473..12852761 100644
--- a/chaika/chrome/content/chaika/defaults/defaultname.txt
+++ b/chaika/chrome/content/chaika/defaults/defaultname.txt
@@ -15,9 +15,13 @@
 # �@ �\�t�g�E�F�A�‚ƌ����̃e�X�g�‚��`����ꍇ
 #
 #------------------------------------------------------------------------------
-# �� ID/�z�X�g�� [1 �ˆȏ�� TAB] ���O
-# ���t�@�C���̏�̕�����`�F�b�N���Ă����A�ŏ��Ƀ}�b�`�����s�̒�`���g���܂�
-# �@���̗Ⴞ�� software �‚ł́u�Ӂ[ �΁[�v�ƂȂ�܂�
+# �–� [1 �ˆȏ�� TAB] ���[���A�h���X [1 �ˆȏ�� TAB] �K�p�Ώ�
+#    - �u�–��v�ɂ� �‚�ID/�z�X�g ���w�肵�܂�
+#      �����w�肳��Ă��Ȃ��ꍇ�ɂ͑S�Ă̔‚��ΏۂƂȂ�܂�
+#    - �u�K�p�Ώہv�ɂ� all (���ׂ�), thread (�X�����Ď��̂�), post (���X���̂�) �̂����ꂩ���w�肵�܂�
+#      �����w�肳��Ă��Ȃ��ꍇ�ɂ� all ���w�肳�ꂽ���̂Ƃ݂Ȃ��܂�
+#    - �t�@�C���̏�̕�����`�F�b�N���Ă����A�ŏ��Ƀ}�b�`�����s�̒�`���g���܂�
+#      ���̗Ⴞ�� software �‚ł́u�Ӂ[ �΁[�v�ƂȂ�܂�
 #------------------------------------------------------------------------------
 #
 #software	�Ӂ[ �΁[
diff --git a/chaika/chrome/content/chaika/defaults/skin/Footer.html b/chaika/chrome/content/chaika/defaults/skin/Footer.html
index 529f8a93..20972765 100644
--- a/chaika/chrome/content/chaika/defaults/skin/Footer.html
+++ b/chaika/chrome/content/chaika/defaults/skin/Footer.html
@@ -5,6 +5,7 @@
 
 <!-- For Firefox 28- -->
 <script type="application/javascript;version=1.7" src="<SKINPATH/>promise.min.js" charset="utf-8"></script>
+
 <script type="application/javascript;version=1.7" src="<SKINPATH/>script.js" charset="utf-8"></script>
 </body>
 </html>
diff --git a/chaika/chrome/content/chaika/defaults/skin/Header.html b/chaika/chrome/content/chaika/defaults/skin/Header.html
index 5661bc56..083fe9c0 100644
--- a/chaika/chrome/content/chaika/defaults/skin/Header.html
+++ b/chaika/chrome/content/chaika/defaults/skin/Header.html
@@ -49,12 +49,12 @@ <h1 id="pageTitle"><THREADNAME/></h1>
 <div id="settings" class="popup">
     <fieldset>
         <legend>��Q��</legend>
-        <label><input type="checkbox" id="pref-enable-referred-count" /> ��Q�Ɛ���\������</label>
+        <label><input type="checkbox" id="pref-enable-referred-count" /> ��Q�Ɛ���\������ *</label>
     </fieldset>
     
     <fieldset>
         <legend>ID�\��</legend>
-        <label><input type="checkbox" id="pref-enable-posts-count" /> ��������\������</label>
+        <label><input type="checkbox" id="pref-enable-posts-count" /> ��������\������ *</label>
     </fieldset>
     
     <fieldset>
@@ -68,6 +68,17 @@ <h1 id="pageTitle"><THREADNAME/></h1>
         </label>
     </fieldset>
     
+    <fieldset>
+    	<legend>�V���[�g�J�b�g�L�[</legend>
+    	<label><input type="checkbox" id="pref-enable-shortcut" /> �V���[�g�J�b�g�L�[��L���ɂ��� *</label>
+    	<label><input type="checkbox" id="pref-enable-resjump" /> �����L�[�ɂ�郌�X�W�����v��L���ɂ���</label>
+    	<div>�L�[�}�b�s���O�̐ݒ�͒��� <a href="<SKINPATH/>script.js">script.js</a> ��ҏW���ĉ�����</div>
+    </fieldset>
+    
+    <div>
+    	* �̕t���Ă���ݒ�̓����[�h��ɔ��f����܂�
+    </div>
+    
     <div id="settings-buttonset">
         <input type="button" value="OK" onclick="Prefs.close();" />
     </div>
diff --git a/chaika/chrome/content/chaika/defaults/skin/script.js b/chaika/chrome/content/chaika/defaults/skin/script.js
index 974e26fc..35cf4449 100644
--- a/chaika/chrome/content/chaika/defaults/skin/script.js
+++ b/chaika/chrome/content/chaika/defaults/skin/script.js
@@ -58,11 +58,16 @@ var $ = {
      * class から親要素を取得
      * @param {String} className class 名
      * @param {Node} element 起点の要素
+     * @param {Boolean} [includeSelf=false] 自分自身を対象に含めるか否か
      * @return {Node}
      */
-    parentByClass: function(className, element){
+    parentByClass: function(className, element, includeSelf){
         if(!element) return null;
 
+        if(includeSelf && element.classList.contains(className)){
+            return element;
+        }
+
         while(element = element.parentNode){
             if(element.classList && element.classList.contains(className)){
                 return element;
@@ -237,6 +242,24 @@ var $ = {
 
         return template;
     },
+
+
+    /**
+     * 指定した要素までスクロールする
+     * @param {Element} element スクロール先の要素
+     * @param {Boolean} [ignoreHeader=false] ページヘッダーの分を考慮しないようにする
+     */
+    scrollToElement: function(element, ignoreHeader){
+        if(!element) return;
+
+        let top = element.offsetTop;
+
+        if(!ignoreHeader){
+            top -= $.rect($.id("pageTitle")).height;
+        }
+
+        window.scrollTo(0, top - 30);
+    }
 };
 
 
@@ -292,25 +315,6 @@ var Effects = {
 };
 
 
-function init(){
-    //新着位置までスクロール
-    if(!location.hash){
-        var newMark = $.id("newMark");
-        var pageTitle = $.id("pageTitle");
-
-        if(newMark && pageTitle){
-            window.scrollTo(0, (newMark.offsetTop - $.rect(pageTitle).height - 30));
-        }
-    }
-
-    Prefs.startup();
-    ResInfo.startup();
-    ResCollapse.startup();
-    AboneHandler.startup();
-    Popup.startup();
-}
-
-
 
 /**
  * 設定項目を扱う
@@ -318,16 +322,21 @@ function init(){
 var Prefs = {
 
     defaultValue: {
-
+        // 被参照
         'pref-enable-referred-count': true,
 
+        // ID 表示
         'pref-enable-posts-count': true,
 
+        // ポップアップ
         'pref-include-self-post': false,
         'pref-disable-single-id-popup': false,
         'pref-delay-popup': true,
         'pref-max-posts-in-popup': 20,
 
+        // ショートカットキー
+        'pref-enable-shortcut': true,
+        'pref-enable-resjump': true,
     },
 
 
@@ -353,10 +362,16 @@ var Prefs = {
 
     /**
      * 設定項目を取得する
-     * localStorage.getItem へのシンタックスシュガー
      */
     get: function(key){
-        let value = JSON.parse(localStorage.getItem(key));
+        let value;
+
+        try{
+            value = JSON.parse(localStorage.getItem(key));
+        }catch(ex){
+            // localStorage へのアクセスが拒否された場合
+            value = this.defaultValue[key];
+        }
 
         if(value === null){
             value = this.defaultValue[key];
@@ -368,10 +383,14 @@ var Prefs = {
 
     /**
      * 設定項目を設定する
-     * localStorage.setItem へのシンタックスシュガー
      */
     set: function(key, value){
-        localStorage.setItem(key, JSON.stringify(value));
+        try{
+            localStorage.setItem(key, JSON.stringify(value));
+        }catch(ex){
+            console.warn('The change is ignored and will not be saved ' +
+                         'because writing to the local storage is prohibited by the user.');
+        }
     },
 
 
@@ -397,6 +416,7 @@ var Prefs = {
 };
 
 
+
 /**
  * 全レスを走査しないと得られない情報を扱う
  */
@@ -490,35 +510,218 @@ var ResInfo = {
 
 
 
-var ResCollapse = {
+/**
+ * スレッドに対するコマンドの実装
+ */
+var ThreadCommand = {
+
+    /**
+     * スレッドに書き込む
+     */
+    write: function(){
+        location.href = 'chaika://post/' + EXACT_URL;
+    },
+
+
+    /**
+     * 新着レスへ移動する
+     */
+    scrollToNewMark: function(){
+        $.scrollToElement($.id("newMark"));
+    },
+
+
+    /**
+     * 現在ウィンドウの表示領域にあるレスのうち, もっとも上にあるものを取得する
+     * @return {Element}
+     */
+    _getCurrentRes: function(){
+        let left = document.documentElement.clientWidth / 2;
+        let top = $.rect($.id("pageTitle")).bottom + 40;
+        let res;
+
+        while(!res){
+            let element = document.elementFromPoint(left, top);
+
+            res = $.parentByClass('resContainer', element, true);
+            top += 8;
+        }
+
+        return res;
+    },
+
+
+    /**
+     * 次のレスへ移動する
+     */
+    scrollToNextRes: function(){
+        $.scrollToElement(this._getCurrentRes().nextElementSibling);
+    },
+
+
+    /**
+     * 前のレスへ移動する
+     */
+    scrollToPrevRes: function(){
+        $.scrollToElement(this._getCurrentRes().previousElementSibling);
+    },
+
+
+    /**
+     * スレッドを再読込する
+     */
+    reload: function(){
+        location.reload();
+    }
+};
+
+
+
+/**
+ * レスに対するコマンドの実装
+ */
+var ResCommand = {
 
     startup: function(){
-        document.addEventListener('click', this.toggleCollapse, false);
+        document.addEventListener('click', this, false);
     },
 
 
-    toggleCollapse: function(aEvent){
-        var target = aEvent.originalTarget;
+    handleEvent: function(aEvent){
+        let target = aEvent.originalTarget;
+        let container = $.parentByClass('resContainer', target, true);
 
-        //HTML外要素の場合
+        // HTML 外要素の場合
         if(!(target instanceof HTMLElement)) return;
 
-        if(target.className !== "resHeader"){
-            target = $.parentByClass('resHeader', target);
-            if(!target) return;
+        // レス要素外の場合
+        if(!container) return;
+
+
+        switch(target.className){
+            case 'resNumber':
+                this.replyTo(target.textContent);
+                break;
+
+            default:
+                if($.parentByClass('resHeader', target, true) && container.dataset.aboned === 'true'){
+                    this.toggleCollapse(container);
+                }
+                break;
         }
+    },
+
 
-        var resContainer = target.parentNode;
+    /**
+     * 返信する
+     * @param {Number} resNumber 返信元のレス番号
+     */
+    replyTo: function(resNumber){
+        location.href = 'chaika://post/' + EXACT_URL + resNumber;
+    },
+
+
+    /**
+     * 指定したレスの位置までスクロールする
+     * @param {Number} resNumber スクロール先のレス番号
+     */
+    scrollTo: function(resNumber){
+        $.scrollToElement($.selector('article[data-number="' + resNumber + '"]'));
+    },
 
-        //あぼーんレスでなかった場合は終了
-        if(resContainer.dataset.aboned !== 'true') return;
 
+    /**
+     * レスの表示/非表示を切り替える
+     * @param {Element} resContainer 対象のレス要素
+     */
+    toggleCollapse: function(resContainer){
         resContainer.classList.toggle('collapsed');
     }
 
 };
 
 
+
+/**
+ * キーショートカットを扱う
+ */
+var ShortcutHandler = {
+
+    /**
+     * ショートカットキーと機能とのマッピング
+     * 押した順に + で結合される.
+     * 例えば Control, Shift, Enter の順で押せば Ctrl+Shift+Enter となる.
+     * キーの名称は
+     *    https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent.key#Key_values
+     * を, 機能については ThreadCommand, ResCommand を参照.
+     */
+    keyMap: {
+        'Control+Enter': function(){ ThreadCommand.write(); },
+        'Shift+Enter': function(){ ThreadCommand.write(); },
+        'w': function(){ ThreadCommand.write(); },
+        'r': function(){ ThreadCommand.reload(); },
+        'n': function(){ ThreadCommand.scrollToNewMark(); },
+        'j': function(){ ThreadCommand.scrollToNextRes(); },
+        'k': function(){ ThreadCommand.scrollToPrevRes(); },
+        'f': function(){ window.scrollByPages(1); },
+        'b': function(){ window.scrollByPages(-1); },
+    },
+
+
+    /**
+     * 押したキーを格納するスタック
+     * @type {Array.<String>}
+     */
+    _keyStack: [],
+
+
+    /**
+     * 1回の操作であると認識する時間 [ms]
+     * @type {Number}
+     */
+    _threshold: 500,
+
+
+    startup: function(){
+        if(Prefs.get('pref-enable-shortcut')){
+            document.addEventListener('keydown', this, false);
+        }
+    },
+
+
+    handleEvent: function(aEvent){
+        if(aEvent.defaultPrevented) return;
+        if(/(?:textarea|input|select|button)/i.test(aEvent.target.tagName)) return;
+
+
+        this._keyStack.push(aEvent.key);
+
+        let keyStr = this._keyStack.join('+');
+
+        if(this.keyMap[keyStr]){
+            aEvent.preventDefault();
+            this.keyMap[keyStr].call();
+
+        }else if(Prefs.get('pref-enable-resjump') && /^[\d\+]+$/.test(keyStr)){
+            aEvent.preventDefault();
+            ResCommand.scrollTo(keyStr.replace(/\+/g, ''));
+        }
+
+
+        if(this._timer){
+            clearTimeout(this._timer);
+        }
+
+        this._timer = setTimeout(() => { this._keyStack = []; }, this._threshold);
+    }
+};
+
+
+
+
+/**
+ * 即時あぼーんを扱う
+ */
 var AboneHandler = {
 
     startup: function(){
@@ -526,6 +729,7 @@ var AboneHandler = {
         document.addEventListener('chaika-abone-remove', this, false);
     },
 
+
     handleEvent: function(aEvent){
         var aboneType = aEvent.sourceEvent.type;
         var aboneWord = aEvent.sourceEvent.detail;
@@ -708,9 +912,7 @@ var Popup = {
 
 
         //親ポップアップがある場合は記録する
-        var parent = aEvent.relatedTarget.classList.contains('popup') ?
-                     aEvent.relatedTarget :
-                     $.parentByClass('popup', aEvent.relatedTarget);
+        var parent = $.parentByClass('popup', aEvent.relatedTarget, true);
 
         if(parent){
             popupNode.dataset.parent = $.attrs(parent, 'id');
@@ -743,9 +945,7 @@ var Popup = {
         }
 
         //今マウスが乗っているポップアップ要素
-        let hoveredPopup = aEvent.relatedTarget.classList.contains('popup') ?
-                           aEvent.relatedTarget :
-                           $.parentByClass('popup', aEvent.relatedTarget);
+        let hoveredPopup = $.parentByClass('popup', aEvent.relatedTarget, true);
 
 
         //自分自身が hovered の時は消さない
@@ -1030,4 +1230,19 @@ Popup.Image = {
 };
 
 
+
+function init(){
+    //レス指定がない場合は新着位置までスクロール
+    if(!location.hash){
+        ThreadCommand.scrollToNewMark();
+    }
+
+    Prefs.startup();
+    ResInfo.startup();
+    ResCommand.startup();
+    ShortcutHandler.startup();
+    AboneHandler.startup();
+    Popup.startup();
+}
+
 init();
diff --git a/chaika/chrome/content/chaika/defaults/skin/style.css b/chaika/chrome/content/chaika/defaults/skin/style.css
index c5dd2462..cb1cde4b 100644
--- a/chaika/chrome/content/chaika/defaults/skin/style.css
+++ b/chaika/chrome/content/chaika/defaults/skin/style.css
@@ -173,6 +173,7 @@ body {
 .resNumber {
     font-weight: bold;
     color: #111;
+    cursor: pointer;
 }
 
 .resNew .resNumber {
@@ -351,6 +352,7 @@ body {
     position: fixed;
     top: 0;
     right: 0;
+    line-height: 1.8;
 }
 
 #settings:target{
@@ -372,3 +374,8 @@ label{
 fieldset{
     margin-bottom: 1em;
 }
+
+fieldset > div{
+    font-size: 90%;
+    margin: 0.5em 0 0 1.5em;
+}
diff --git a/chaika/chrome/content/chaika/post/post.js b/chaika/chrome/content/chaika/post/post.js
index 4fb47f4b..e6b6116e 100644
--- a/chaika/chrome/content/chaika/post/post.js
+++ b/chaika/chrome/content/chaika/post/post.js
@@ -653,16 +653,10 @@ PostJBBSNewThread.prototype = Object.create(Post2chNewThread.prototype, {
             var ioService = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
             var bbs = this._board.url.directory.match(/\/([^\/]+)\/?$/)[1];
             var dir = this._board.url.directory.match(/\/([^\/]+)\/?/)[1];
-            var postURI;
-
-            if(this._board.url.host.contains('jbbs.shitaraba.net')){
-                postURI = 'http://jbbs.shitaraba.net/bbs/write.cgi/';
-            }else{
-                postURI = 'http://jbbs.livedoor.jp/bbs/write.cgi/';
-            }
+            var postURI = ioService.newURI('http://jbbs.shitaraba.net/bbs/write.cgi/' +dir + '/' + bbs + '/new/', null, null);
 
             this._listener = aListener;
-            this._httpRequest = new HttpRequest(ioService.newURI(postURI + dir + '/' + bbs + '/new/', null, null), null, this);
+            this._httpRequest = new HttpRequest(postURI, this._board.url, this);
 
             var postData = [];
             postData.push("BBS="    + bbs);
diff --git a/chaika/chrome/content/chaika/post/wizard.js b/chaika/chrome/content/chaika/post/wizard.js
index d48f6970..0c713c7d 100644
--- a/chaika/chrome/content/chaika/post/wizard.js
+++ b/chaika/chrome/content/chaika/post/wizard.js
@@ -121,8 +121,8 @@ function shutdown(){
     // ただし、defaultmail.txtの内容は覚えない
     var sageCheck = document.getElementById("sageCheck");
 
-    if(sageCheck.hasAttribute('previousValue')){
-        sageCheck.setAttribute('checked', sageCheck.getAttribute('previousValue').toString());
+    if(sageCheck.hasAttribute('originalSageChecked')){
+        sageCheck.setAttribute('checked', sageCheck.getAttribute('originalSageChecked').toString());
     }else{
         sageCheck.setAttribute('checked', sageCheck.checked.toString());
     }
@@ -584,16 +584,14 @@ var FormPage = {
 
     /**
      * sageチェックボックスを管理する
-     * @param {Boolean} init 初期化する場合はtrue
+     * @param {Boolean} init 初期化する場合は true
      */
     sageCheck: function FormPage_sageCheck(init){
-        //defaultmail.txtで指定されている場合は、
-        //sageチェックボックスをそれに合わせる
-        if(init && this._mailForm.value){
-            //defaultmail.txtではない時の値を覚えておく
-            this._sageCheck.setAttribute('previousValue', this._sageCheck.checked.toString());
-
-            this._sageCheck.checked = this._mailForm.value.indexOf('sage') > -1;
+        //defaultmail.txt で指定されている場合は、
+        //チェックボックスをそれに合わせて defaultmail.txt ではない時の値を覚えておく
+        if(init && this._getDefaultData('defaultmail.txt') !== null){
+            this._sageCheck.setAttribute('originalSageChecked', this._sageCheck.checked.toString());
+            this._sageCheck.checked = this._mailForm.value.contains('sage');
         }
 
         //emptyTextの設定
@@ -749,37 +747,51 @@ var FormPage = {
     },
 
 
-    _setDefaultMailName: function FormPage_setDefaultMailName(){
+    _getDefaultData: function(aFileName){
+        let defaultDataFile = ChaikaCore.getDataDir();
+        defaultDataFile.appendRelativePath(aFileName);
+
+        if(!defaultDataFile.exists()){
+            let defaultsFile = ChaikaCore.getDefaultsDir();
+            defaultsFile.appendRelativePath(defaultDataFile.leafName);
+            defaultsFile.copyTo(defaultDataFile.parent, null);
+            defaultDataFile = defaultDataFile.clone();
+        }
+
+        let boardURL = gBoard.url.spec;
+        let lines = ChaikaCore.io.readString(defaultDataFile, "Shift_JIS")
+                                 .split(/[\n\r]+/);
+
+        for(let i=0; i<lines.length; i++){
+            // タブがない行は単なる空行
+            if(!lines[i].contains('\t')) continue;
 
-        function getDefaultData(aFileName){
-            var defaultDataFile = ChaikaCore.getDataDir();
-            defaultDataFile.appendRelativePath(aFileName);
+            // コメント行
+            if(/^\s*(?:;|'|#|\/\/)/.test(lines[i])) continue;
 
-            if(!defaultDataFile.exists()){
-                var defaultsFile = ChaikaCore.getDefaultsDir();
-                defaultsFile.appendRelativePath(defaultDataFile.leafName);
-                defaultsFile.copyTo(defaultDataFile.parent, null);
-                defaultDataFile = defaultDataFile.clone();
+
+            let [boardID, defaultData, target] = lines[i].split(/\t+/);
+
+            if(target && ((target === 'thread' && gWizType !== WIZ_TYPE_NEW_THREAD) ||
+                          (target === 'post' && gWizType !== WIZ_TYPE_RES))){
+                continue;
             }
 
-            var urlSpec = gBoard.url.spec;
-            var lines = ChaikaCore.io.readString(defaultDataFile, "Shift_JIS")
-                            .replace(/\r/g, "\n").split(/\n+/);
-            for(var i=0; i<lines.length; i++){
-                var data = lines[i].split(/\t+/);
-                if(!(/^\s*(?:;|'|#|\/\/)/).test(data[0]) && urlSpec.indexOf(data[0]) != -1){
-                    return (data[1]);
-                }
+            if(boardURL.contains(boardID)){
+                return defaultData;
             }
-            return null;
         }
 
+        return null;
+    },
+
 
-        var defaultData = getDefaultData("defaultmail.txt");
-        if(defaultData) this._mailForm.value = defaultData;
+    _setDefaultMailName: function FormPage_setDefaultMailName(){
+        let defaultMail = this._getDefaultData("defaultmail.txt");
+        if(defaultMail !== null) this._mailForm.value = defaultMail;
 
-        defaultData = getDefaultData("defaultname.txt");
-        if(defaultData) this._nameForm.value = defaultData;
+        let defaultName = this._getDefaultData("defaultname.txt");
+        if(defaultName !== null) this._nameForm.value = defaultName;
     }
 };
 
diff --git a/chaika/chrome/content/chaika/releasenotes.html b/chaika/chrome/content/chaika/releasenotes.html
index ad075de6..9256d1aa 100644
--- a/chaika/chrome/content/chaika/releasenotes.html
+++ b/chaika/chrome/content/chaika/releasenotes.html
@@ -178,6 +178,81 @@ <h1>chaika が新しいバージョンへと更新されました。</h1>
         </p>
     </section>
 
+    <section>
+        <h1>1.7.1 - 2014/11/2</h1>
+        <ul>
+            <li class="new">
+                置換マネージャによりレスの内容やスレタイを置換できるようになりました
+                (<a href="https://github.com/chaika/chaika/issues/142">#142</a>)
+            </li>
+            <li class="new">
+                ツールバーボタンを押すことでサイドバーが開くようになりました
+                (<a href="https://github.com/chaika/chaika/issues/98">#98</a>)
+            </li>
+            <li class="new">
+                デフォルトスキンでレス番号をクリックして返信できるようになりました
+                (<a href="https://github.com/chaika/chaika/issues/130">#130</a>)
+            </li>
+            <li class="new">
+                デフォルトスキンでキーボートショートカットを実装しました
+                (<a href="https://github.com/chaika/chaika/issues/131">#131</a>)
+                <aside class="info">
+                    <p>
+                        デフォルトのショートカットは以下のとおりです。
+                        変更する場合には script.js 内の <code>ShortcutHandler</code> 部分を直接編集して下さい。
+                    </p>
+                    <ul class="list">
+                        <li>書き込み: Ctrl + Enter, Shift + Enter, w</li>
+                        <li>再読み込み: r</li>
+                        <li>新着レスへ移動: n</li>
+                        <li>次のレスへ移動: j</li>
+                        <li>前のレスへ移動: k</li>
+                        <li>次のページヘ移動: f</li>
+                        <li>前のページヘ移動: b</li>
+                        <li>レス番号へ移動: レス番号を数字で入力</li>
+                    </ul>
+                </aside>
+            </li>
+            <li class="new">
+                ImageViewURLReplace.dat にて変更された URL を表示した場合に元の URL へ移動するかを尋ねるようになりました
+                (<a href="https://github.com/chaika/chaika/issues/65">#65</a>)
+            </li>
+            <li class="fixed">
+                したらばの仕様変更によりスレッドが立てられなくなっていた問題を修正しました
+                (<a href="https://github.com/chaika/chaika/issues/150">#150</a>)
+            </li>
+            <li class="fixed">
+                コンテキストメニューをフラットにすると正しく動作しなくなる問題を修正しました
+                (<a href="https://github.com/chaika/chaika/issues/143">#143</a>)
+            </li>
+            <li class="fixed">
+                Google の検索結果でリンク先に関するコンテキストメニューが表示されない問題を修正しました
+                (<a href="https://github.com/chaika/chaika/issues/153">#153</a>)
+            </li>
+            <li class="fixed">
+                NGEx で対象が空文字の場合に正しく条件を判定できない問題を修正しました
+                (<a href="https://github.com/chaika/chaika/issues/151">#151</a>)
+            </li>
+            <li class="fixed">
+                NG データが1つしかない場合にその NG データを削除できない問題を修正しました
+                (<a href="https://github.com/chaika/chaika/issues/152">#152</a>)
+            </li>
+            <li class="fixed">
+                サイドバー検索において一部の文字が検索できない問題を修正しました
+                (<a href="https://github.com/chaika/chaika/issues/136">#136</a>)
+            </li>
+            <li class="fixed">
+                スレッド一覧やスレッド表示で一部の文字が文字化けする問題を修正しました
+                (<a href="https://github.com/chaika/chaika/issues/135">#135</a>,
+                 <a href="https://github.com/chaika/chaika/issues/149">#149</a>)
+            </li>
+            <li class="fixed">
+                Cookie が無効な場合にデフォルトスキンの全機能が使用できなくなる問題を修正しました
+                (<a href="https://github.com/chaika/chaika/issues/129">#129</a>)
+            </li>
+        </ul>
+    </section>
+
     <section>
         <h1>1.7.0 - 2014/10/14</h1>
         <ul>
diff --git a/chaika/chrome/content/chaika/settings/abone-manager-ngex.js b/chaika/chrome/content/chaika/settings/abone-manager-ngex.js
index df0f30be..6ccc8760 100644
--- a/chaika/chrome/content/chaika/settings/abone-manager-ngex.js
+++ b/chaika/chrome/content/chaika/settings/abone-manager-ngex.js
@@ -129,6 +129,9 @@ NGExView.prototype = {
 
         this.setAutoNaming(true);
         this.insertRule();
+
+        let now = new Date();
+        this._populateExpire(new Date(now.getFullYear(), now.getMonth(), now.getDate() + 1));
     },
 
 
@@ -356,21 +359,12 @@ NGExView.prototype = {
         this._root.querySelector('.hide-abone').value = ngData.hide + '';
         this._root.querySelector('.chain-abone').value = ngData.chain + '';
 
-        if(typeof ngData.expire === 'number'){
-            this._root.querySelector('.set-expire').checked = true;
+        let now = new Date();
+        let expire = ngData.expire ? new Date(ngData.expire) :
+                                     new Date(now.getFullYear(), now.getMonth(), now.getDate() + 1);
 
-            let datepicker = this._root.querySelector('.expire-date');
-            let timepicker = this._root.querySelector('.expire-time');
-            let expire = new Date(ngData.expire);
-
-            datepicker.year = expire.getFullYear();
-            datepicker.month = expire.getMonth();
-            datepicker.date = expire.getDate();
-            timepicker.hour = expire.getHours();
-            timepicker.minute = expire.getMinutes();
-        }else{
-            this._root.querySelector('.set-expire').checked = false;
-        }
+        this._root.querySelector('.set-expire').checked = !!ngData.expire;
+        this._populateExpire(expire);
 
 
         this.clearRules();
@@ -401,4 +395,16 @@ NGExView.prototype = {
         }
     },
 
+
+    _populateExpire: function(expire){
+        let datepicker = this._root.querySelector('.expire-date');
+        let timepicker = this._root.querySelector('.expire-time');
+
+        datepicker.year = expire.getFullYear();
+        datepicker.month = expire.getMonth();
+        datepicker.date = expire.getDate();
+        timepicker.hour = expire.getHours();
+        timepicker.minute = expire.getMinutes();
+    }
+
 };
diff --git a/chaika/chrome/content/chaika/settings/abone-manager-ngex.xul b/chaika/chrome/content/chaika/settings/abone-manager-ngex.xul
index 16179e70..87ae0ffb 100644
--- a/chaika/chrome/content/chaika/settings/abone-manager-ngex.xul
+++ b/chaika/chrome/content/chaika/settings/abone-manager-ngex.xul
@@ -55,7 +55,7 @@
                             <menuitem label="ID" value="id" />
                             <menuitem label="BeID" value="be" />
                             <menuitem label="Be基礎番号" value="baseBe" />
-                            <menuitem label="本文" value="msg" />
+                            <menuitem label="本文" value="msg" selected="true" />
                             <menuitem label="スレタイ" value="title" />
                             <menuitem label="板URL" value="board_url" />
                             <menuitem label="スレURL" value="thread_url" />
diff --git a/chaika/chrome/content/chaika/settings/bbsmenu-pane.xul b/chaika/chrome/content/chaika/settings/bbsmenu-pane.xul
index ae714cc7..83361fdd 100644
--- a/chaika/chrome/content/chaika/settings/bbsmenu-pane.xul
+++ b/chaika/chrome/content/chaika/settings/bbsmenu-pane.xul
@@ -11,10 +11,6 @@
     <preferences>
         <preference id="extensions.chaika.bbsmenu.search.default_engine_name"
                     name="extensions.chaika.bbsmenu.search.default_engine_name" type="string" />
-        <preference id="extensions.chaika.historymenu.board_max"
-                    name="extensions.chaika.historymenu.board_max" type="int"/>
-        <preference id="extensions.chaika.historymenu.thread_max"
-                    name="extensions.chaika.historymenu.thread_max" type="int"/>
         <preference id="extensions.chaika.bbsmenu.toggle_open_container"
                     name="extensions.chaika.bbsmenu.toggle_open_container" type="bool"/>
         <preference id="extensions.chaika.bbsmenu.tree_size"
@@ -40,28 +36,12 @@
                           preference="extensions.chaika.bbsmenu.search.default_engine_name" />
             </hbox>
             <hbox>
-                <button label="ディレクトリを開く" oncommand="gBbsmenuPane.openSearchPluginDir()" />
+                <button label="プラグインフォルダを開く" oncommand="gBbsmenuPane.openSearchPluginDir()" />
                 <spacer flex="1" />
             </hbox>
         </vbox>
     </groupbox>
 
-    <groupbox>
-        <caption class="setting-description" label="履歴メニュー" />
-        <vbox align="left">
-            <hbox align="center">
-                <label value="板表示数:"/>
-                <textbox type="number" min="0" max="20" size="1"
-                         preference="extensions.chaika.historymenu.board_max"/>
-            </hbox>
-            <hbox align="center">
-                <label value="スレ表示数:"/>
-                <textbox type="number" min="0" max="20" size="1"
-                         preference="extensions.chaika.historymenu.thread_max"/>
-            </hbox>
-        </vbox>
-    </groupbox>
-
     <groupbox>
         <caption class="setting-description" label="ツリー" />
         <vbox>
diff --git a/chaika/chrome/content/chaika/settings/general-pane.js b/chaika/chrome/content/chaika/settings/general-pane.js
index 55367cef..70bc8e1b 100644
--- a/chaika/chrome/content/chaika/settings/general-pane.js
+++ b/chaika/chrome/content/chaika/settings/general-pane.js
@@ -76,5 +76,9 @@ var gGeneralPane = {
         var txtDataDir = document.getElementById("txtDataDir");
         if(!dataDirPref.value) return "";
         return dataDirPref.value;
+    },
+
+    openReplacementManager: function(){
+        document.documentElement.openWindow("", "chrome://chaika/content/settings/replacement-manager.xul");
     }
 };
diff --git a/chaika/chrome/content/chaika/settings/general-pane.xul b/chaika/chrome/content/chaika/settings/general-pane.xul
index 32d20f2a..f907566c 100644
--- a/chaika/chrome/content/chaika/settings/general-pane.xul
+++ b/chaika/chrome/content/chaika/settings/general-pane.xul
@@ -9,18 +9,29 @@
 <prefpane id="paneGeneral" onpaneload="gGeneralPane.startup()">
 
     <preferences>
-        <preference id="extensions.chaika.http_proxy_mode"
-                name="extensions.chaika.http_proxy_mode" type="int"
-                onchange="setContainerDisabled(this.name, 'txtProxyValue', 2)"/>
-        <preference id="extensions.chaika.http_proxy_value"
-                name="extensions.chaika.http_proxy_value" type="unichar"/>
+        <preference id="extensions.chaika.warn_when_delete_log"
+                    name="extensions.chaika.warn_when_delete_log"
+                    type="bool"/>
         <preference id="extensions.chaika.appoint_data_dir"
-                name="extensions.chaika.appoint_data_dir" type="bool"
-                onchange="setContainerDisabled(this.name, 'boxDataDir', true)"/>
+                    name="extensions.chaika.appoint_data_dir"
+                    type="bool"
+                    onchange="setContainerDisabled(this.name, 'boxDataDir', true)"/>
         <preference id="extensions.chaika.data_dir"
-                name="extensions.chaika.data_dir" type="unichar"/>
-        <preference id="extensions.chaika.warn_when_delete_log" type="bool"
-                name="extensions.chaika.warn_when_delete_log"/>
+                    name="extensions.chaika.data_dir"
+                    type="unichar"/>
+        <preference id="extensions.chaika.historymenu.board_max"
+                    name="extensions.chaika.historymenu.board_max"
+                    type="int"/>
+        <preference id="extensions.chaika.historymenu.thread_max"
+                    name="extensions.chaika.historymenu.thread_max"
+                    type="int"/>
+        <preference id="extensions.chaika.http_proxy_mode"
+                    name="extensions.chaika.http_proxy_mode"
+                    type="int"
+                    onchange="setContainerDisabled(this.name, 'txtProxyValue', 2)"/>
+        <preference id="extensions.chaika.http_proxy_value"
+                    name="extensions.chaika.http_proxy_value"
+                    type="unichar"/>
     </preferences>
 
     <script type="application/x-javascript; version=1.7"
@@ -44,6 +55,22 @@
         </vbox>
     </groupbox>
 
+    <groupbox>
+        <caption class="setting-description" label="履歴" />
+        <vbox align="left">
+            <hbox align="center">
+                <label value="記憶する板の数:"/>
+                <textbox type="number" min="0" max="20" size="1"
+                         preference="extensions.chaika.historymenu.board_max"/>
+            </hbox>
+            <hbox align="center">
+                <label value="記憶するスレの数:"/>
+                <textbox type="number" min="0" max="20" size="1"
+                         preference="extensions.chaika.historymenu.thread_max"/>
+            </hbox>
+        </vbox>
+    </groupbox>
+
     <groupbox>
         <caption class="setting-description" label="プロキシ" />
         <hbox align="start">
@@ -58,6 +85,14 @@
         </hbox>
     </groupbox>
 
+    <groupbox>
+        <caption class="setting-description" label="置換" />
+        <vbox align="start">
+            <button label="置換マネージャ..."
+                    oncommand="gGeneralPane.openReplacementManager()" />
+        </vbox>
+    </groupbox>
+
     <vbox style="margin:0.5em 0px 0px 0.5em">
         <description>* 設定変更はブラウザ再起動後に反映されます</description>
     </vbox>
diff --git a/chaika/chrome/content/chaika/settings/replacement-manager-editor.xml b/chaika/chrome/content/chaika/settings/replacement-manager-editor.xml
new file mode 100644
index 00000000..9c216776
--- /dev/null
+++ b/chaika/chrome/content/chaika/settings/replacement-manager-editor.xml
@@ -0,0 +1,427 @@
+<?xml version="1.0"?>
+
+<!-- See license.txt for terms of usage -->
+
+<bindings id="chaikaReplacementManagerEditorBindings"
+        xmlns="http://www.mozilla.org/xbl"
+        xmlns:xbl="http://www.mozilla.org/xbl"
+        xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+<binding id="editor">
+    <content>
+        <xul:vbox flex="1" anonid="root">
+            <xul:hbox align="center" pack="start">
+                <xul:label value="ラベル:" />
+                <xul:textbox class="label" flex="1" />
+                <xul:checkbox label="自動" checked="true" anonid="auto-naming" class="auto-naming" />
+            </xul:hbox>
+
+            <xul:groupbox flex="1">
+                <xul:caption label="条件" />
+
+                <xul:hbox align="center" pack="start">
+                    <xul:description value="次の" />
+
+                    <xul:menulist class="match">
+                        <xul:menupopup>
+                            <xul:menuitem label="すべて" value="all" />
+                            <xul:menuitem label="いずれか" value="any" />
+                        </xul:menupopup>
+                    </xul:menulist>
+
+                    <xul:description value="のルールに一致する場合に置換を行う: (空欄にすると条件を未設定にできます)" />
+                </xul:hbox>
+
+                <xul:vbox class="container rules" flex="1" />
+                <xul:vbox class="template">
+                    <xul:hbox align="center" pack="start">
+                        <xul:menulist class="rule-target">
+                            <xul:menupopup>
+                                <xul:menuitem label="名前" value="name" />
+                                <xul:menuitem label="メール" value="mail" />
+                                <xul:menuitem label="日付" value="date" />
+                                <xul:menuitem label="発信元" value="ip" />
+                                <xul:menuitem label="ホスト" value="host" />
+                                <xul:menuitem label="ID" value="id" />
+                                <xul:menuitem label="BeID" value="be" />
+                                <xul:menuitem label="Be基礎番号" value="baseBe" />
+                                <xul:menuitem label="本文" value="msg" />
+                                <xul:menuitem label="スレタイ" value="title" />
+                                <xul:menuitem label="板URL" value="board_url" />
+                                <xul:menuitem label="スレURL" value="thread_url" />
+                            </xul:menupopup>
+                        </xul:menulist>
+
+                        <xul:label value="が" />
+
+                        <xul:textbox class="rule-query" />
+
+                        <xul:menulist class="rule-condition">
+                            <xul:menupopup>
+                                <xul:menuitem label="を含む" value="contains" />
+                                <xul:menuitem label="を含まない" value="notContain" />
+                                <xul:menuitem label="と一致する" value="equals" />
+                                <xul:menuitem label="と一致しない" value="notEqual" />
+                                <xul:menuitem label="で始まる" value="startsWith" />
+                                <xul:menuitem label="で終わる" value="endsWith" />
+                            </xul:menupopup>
+                        </xul:menulist>
+
+                        <xul:checkbox label="正規表現" class="rule-regexp" />
+                        <xul:checkbox label="Aa" class="rule-case-sensitive" checked="true" />
+
+                        <xul:spacer flex="1" />
+
+                        <xul:button label="-" anonid="rule-button-remove" />
+                        <xul:button label="+" anonid="rule-button-add" />
+                    </xul:hbox>
+                </xul:vbox>
+            </xul:groupbox>
+
+            <xul:groupbox>
+                <xul:caption label="置換" />
+
+                <xul:hbox align="center" pack="start">
+                    <xul:menulist class="target">
+                        <xul:menupopup>
+                            <xul:menuitem label="名前" value="name" />
+                            <xul:menuitem label="メール" value="mail" />
+                            <xul:menuitem label="日付" value="date" />
+                            <xul:menuitem label="発信元" value="ip" />
+                            <xul:menuitem label="ホスト" value="host" />
+                            <xul:menuitem label="本文" value="msg" />
+                            <xul:menuitem label="ID" value="id" />
+                            <xul:menuitem label="スレタイ (一覧)"
+                                          value="thread_title_on_list"
+                                          tooltiptext="スレッド一覧にて表示する場合のみ置換を行います." />
+                            <xul:menuitem label="スレタイ (subject.txt)"
+                                          value="thread_title_subjecttxt"
+                                          tooltiptext="subject.txt から受信したデータそのものを置換します(実験的機能)." />
+                        </xul:menupopup>
+                    </xul:menulist>
+                    <xul:description value="を次のように置換する:" />
+                </xul:hbox>
+
+                <xul:vbox>
+                    <xul:label value="検索文字列" />
+                    <xul:textbox class="search-text" multiline="true" flex="1" />
+                </xul:vbox>
+
+                <xul:vbox>
+                    <xul:label value="置換文字列" tooltip="special-replacement-patterns-desc" />
+                    <xul:textbox class="replace-text" multiline="true" flex="1" tooltip="special-replacement-patterns-desc" />
+
+                    <xul:tooltip id="special-replacement-patterns-desc" orient="vertical">
+                        <xul:description value="置換文字列には以下の特殊な文字を指定することができます:" />
+                        <xul:vbox style="margin-left: 1.5em;">
+                            <xul:hbox>
+                                <xul:description value="$$" class="dt" />
+                                <xul:description value=": $ そのものを表します." />
+                            </xul:hbox>
+                            <xul:hbox>
+                                <xul:description value="$&amp;" class="dt" />
+                                <xul:description value=": マッチした部分のテキストを表します." />
+                            </xul:hbox>
+                            <xul:hbox>
+                                <xul:description value="$`" class="dt" />
+                                <xul:description value=": マッチした部分より前の文字列を表します." />
+                            </xul:hbox>
+                            <xul:hbox>
+                                <xul:description value="$'" class="dt" />
+                                <xul:description value=": マッチした部分より後の文字列を表します." />
+                            </xul:hbox>
+                            <xul:hbox>
+                                <xul:description value="$n" class="dt" />
+                                <xul:description value=": n には自然数が入ります. n 番目のカッコでキャプチャされたサブマッチの文字列を表します. 正規表現の時のみ利用可能です." />
+                            </xul:hbox>
+                        </xul:vbox>
+                    </xul:tooltip>
+                </xul:vbox>
+            </xul:groupbox>
+
+            <xul:groupbox>
+                <xul:caption label="オプション" />
+
+                <xul:vbox>
+                    <xul:checkbox class="regexp" label="正規表現" />
+                    <xul:checkbox class="case-sensitive" label="大文字小文字を区別する" checked="true" />
+                    <xul:checkbox class="global" label="全て置換する" checked="true"
+                                  tooltiptext="OFF にすると初めに一致した文字列のみを置換します." />
+                </xul:vbox>
+            </xul:groupbox>
+        </xul:vbox>
+    </content>
+
+    <resources>
+        <stylesheet src="chrome://chaika/skin/settings/replacement-manager.css"/>
+    </resources>
+
+    <handlers>
+        <handler event="command" action="this.handleEvent(event)"/>
+        <handler event="change" action="this.handleEvent(event)"/>
+    </handlers>
+
+    <implementation>
+        <constructor><![CDATA[
+            Components.utils.import("resource://chaika-modules/ChaikaCore.js", this);
+
+            this._root = document.getAnonymousElementByAttribute(this, "anonid", "root");
+            this._labelbox = this._root.querySelector('.label');
+
+            this.insertRule();
+            this.setAutoNaming(true);
+        ]]></constructor>
+
+
+        <method name="handleEvent">
+            <parameter name="aEvent"/>
+            <body><![CDATA[
+                switch(aEvent.type){
+                    case 'command':
+                        switch(aEvent.originalTarget.getAttribute('anonid')){
+                            case 'auto-naming':
+                                this.toggleAutoNaming();
+                                break;
+
+                            case 'rule-button-add':
+                                this.insertRule();
+                                break;
+
+                            case 'rule-button-remove':
+                                this.removeRule(aEvent);
+                                break;
+                        }
+                        break;
+
+                    case 'change':
+                        break;
+
+                    default:
+                        return;
+                }
+
+                if(this._enableAutoNaming){
+                    this.setLabel();
+                }
+            ]]></body>
+        </method>
+
+        <method name="adjustWindowSize">
+            <body><![CDATA[
+                let rules = this._root.querySelector('.rules');
+
+                //ディスプレイ高さの7.5割以上の高さになったら、
+                //そこでウィンドウサイズを大きくするのはやめて、
+                //かわりにルール表示部にスクロールバーを表示する
+                if(window.outerHeight > window.screen.availHeight * 0.75){
+                    window.resizeTo(window.outerWidth, window.screen.availHeight * 0.75);
+
+                    if(!rules.classList.contains('fixed-height')){
+                        rules.classList.add('fixed-height');
+                        rules.style.height = Math.floor(rules.clientHeight) + 'px';
+                    }
+                }
+
+
+                //ルール表示部の下部にまだ余裕がある場合には、
+                //ルール表示部の固定高さ表示を解除する
+                let lastRule = rules.querySelector('.rule:last-child');
+                let rulesBottomMargin = rules.getBoundingClientRect().bottom -
+                                        lastRule.getBoundingClientRect().bottom;
+
+                if(rulesBottomMargin > 0){
+                    rules.classList.remove('fixed-height');
+                    rules.style.height = 'auto';
+                }
+
+
+                //条件を削除するなどして content のサイズが小さくなった場合に
+                //ウィンドウ下部の空白部分が広がってしまう問題に対処する
+                let windowBottomMargin = document.documentElement.getBoundingClientRect().bottom -
+                                         this.getBoundingClientRect().bottom;
+
+                if(windowBottomMargin > 0){
+                    window.resizeBy(0, -windowBottomMargin);
+                }
+
+
+                //条件を追加したときにウィンドウサイズが広がらず、
+                //下部が見切れてしまう問題に対処する
+                //ウィンドウの再描画がうまく行われないことが原因？
+                window.resizeBy(0, 0);
+            ]]></body>
+        </method>
+
+        <method name="insertRule">
+            <parameter name=""/>
+            <body><![CDATA[
+                let template = this._root.querySelector('.template');
+                let newRule = template.cloneNode(true);
+
+                newRule.classList.remove('template');
+                newRule.classList.add('rule');
+
+                this._root.querySelector('.rules').appendChild(newRule);
+
+                this.adjustWindowSize();
+
+                return newRule;
+            ]]></body>
+        </method>
+
+        <method name="removeRule">
+            <parameter name="aEvent"/>
+            <body><![CDATA[
+                let rule = aEvent.originalTarget.parentNode.parentNode;
+                let rules = rule.parentNode;
+
+                if(rules.childNodes.length > 1){
+                    rule.parentNode.removeChild(rule);
+                }
+
+                this.adjustWindowSize();
+            ]]></body>
+        </method>
+
+        <method name="clearRules">
+            <body><![CDATA[
+                let rules = this._root.querySelector('.rules');
+
+                while(rules.childNodes.length > 0){
+                    rules.removeChild(rules.firstChild);
+                }
+            ]]></body>
+        </method>
+
+        <method name="toggleAutoNaming">
+            <body><![CDATA[
+                let checkbox = this._root.querySelector('.auto-naming');
+
+                this._enableAutoNaming =
+                this._labelbox.disabled = checkbox.checked;
+            ]]></body>
+        </method>
+
+        <method name="setAutoNaming">
+            <parameter name="enable"/>
+            <body><![CDATA[
+                let checkbox = this._root.querySelector('.auto-naming');
+
+                checkbox.checked =
+                this._enableAutoNaming =
+                this._labelbox.disabled = enable;
+            ]]></body>
+        </method>
+
+        <method name="setLabel">
+            <body><![CDATA[
+                this._labelbox.value = this.getLabelText();
+            ]]></body>
+        </method>
+
+        <method name="getLabelText">
+            <parameter name=""/>
+            <body><![CDATA[
+                let rules = this._root.querySelectorAll('.rule');
+                let rulesText = '';
+                let target = this._root.querySelector('.target').selectedItem.label;
+                let searchText = this._root.querySelector('.search-text').value;
+
+
+                rulesText = Array.slice(rules).map((rule) => {
+                    let target = rule.querySelector('.rule-target').selectedItem.label;
+                    let query = rule.querySelector('.rule-query').value;
+                    let condition = rule.querySelector('.rule-condition').selectedItem.label;
+
+                    return query ? target + 'が' + query + condition : null;
+                }).filter((rule) => !!rule).join(', ');
+
+                if(rulesText){
+                    let match = this._root.querySelector('.match').selectedItem.label;
+
+                    rulesText += ' の' + match + 'に該当する ';
+                }
+
+
+                return rulesText + target + ' 内の ' + searchText;
+            ]]></body>
+        </method>
+
+        <method name="getReplaceData">
+            <body><![CDATA[
+                let replaceData = {};
+
+                replaceData.title = this._labelbox.value;
+                replaceData.match = this._root.querySelector('.match').value;
+                replaceData.target = this._root.querySelector('.target').value;
+                replaceData.regexp = this._root.querySelector('.regexp').checked;
+                replaceData.ignoreCase = ! this._root.querySelector('.case-sensitive').checked;
+                replaceData.global = this._root.querySelector('.global').checked;
+                replaceData.searchText = this._root.querySelector('.search-text').value;
+                replaceData.replaceText = this._root.querySelector('.replace-text').value;
+
+                let rules = this._root.querySelectorAll('.rule');
+
+                replaceData.rules = Array.slice(rules).map((rule) => {
+                    return {
+                        target: rule.querySelector('.rule-target').value,
+                        query: rule.querySelector('.rule-query').value,
+                        condition: rule.querySelector('.rule-condition').value,
+                        regexp: rule.querySelector('.rule-regexp').checked,
+                        ignoreCase: ! rule.querySelector('.rule-case-sensitive').checked
+                    };
+                }).filter((rule) => !!rule.query);
+
+                return replaceData;
+            ]]></body>
+        </method>
+
+        <method name="populateData">
+            <parameter name="replaceData"/>
+            <body><![CDATA[
+                this._labelbox.value = replaceData.title || '';
+                this._root.querySelector('.match').value = replaceData.match;
+                this._root.querySelector('.target').value = replaceData.target;
+                this._root.querySelector('.regexp').checked = replaceData.regexp;
+                this._root.querySelector('.case-sensitive').checked = ! replaceData.ignoreCase;
+                this._root.querySelector('.global').checked = replaceData.global;
+                this._root.querySelector('.search-text').value = replaceData.searchText;
+                this._root.querySelector('.replace-text').value = replaceData.replaceText;
+
+                this.clearRules();
+
+                replaceData.rules.forEach((rule) => {
+                    let node = this.insertRule();
+
+                    node.querySelector('.rule-target').value = rule.target;
+                    node.querySelector('.rule-query').value = rule.query;
+                    node.querySelector('.rule-condition').value = rule.condition;
+                    node.querySelector('.rule-regexp').checked = !!rule.regexp;
+                    node.querySelector('.rule-case-sensitive').checked = ! rule.ignoreCase;
+                });
+
+                if(replaceData.rules.length < 1){
+                    this.insertRule();
+                }
+
+
+                //タイトルが設定されていないか、
+                //自動ネーミングと設定されているラベルが一致したら
+                //自動ネーミングが有効だと判断する
+                if(!replaceData.title || replaceData.title === this.getLabelText()){
+                    this.setAutoNaming(true);
+                }else{
+                    this.setAutoNaming(false);
+                }
+
+                //もし有効ならラベルをセットする
+                if(this._enableAutoNaming){
+                    this.setLabel();
+                }
+            ]]></body>
+        </method>
+
+    </implementation>
+</binding>
+
+</bindings>
diff --git a/chaika/chrome/content/chaika/settings/replacement-manager-new.js b/chaika/chrome/content/chaika/settings/replacement-manager-new.js
new file mode 100644
index 00000000..cb36a0b1
--- /dev/null
+++ b/chaika/chrome/content/chaika/settings/replacement-manager-new.js
@@ -0,0 +1,32 @@
+/* See license.txt for terms of usage */
+
+Components.utils.import('resource://chaika-modules/ChaikaCore.js');
+Components.utils.import("resource://chaika-modules/ChaikaContentReplacer.js");
+
+var gEditor;
+
+
+function startup(){
+    gEditor = document.getElementById('editor');
+
+    if('arguments' in window &&
+       window.arguments.length > 0 &&
+       typeof window.arguments[0] === 'object'){
+            gEditor.populateData(window.arguments[0]);
+    }
+
+    window.resizeTo(600, 500);
+}
+
+
+function shutdown(){
+}
+
+
+function onDialogAccept(){
+    if(gEditor._enableAutoNaming){
+        gEditor.setLabel();
+    }
+
+    ChaikaContentReplacer.add(gEditor.getReplaceData());
+}
diff --git a/chaika/chrome/content/chaika/settings/replacement-manager-new.xul b/chaika/chrome/content/chaika/settings/replacement-manager-new.xul
new file mode 100644
index 00000000..830fa814
--- /dev/null
+++ b/chaika/chrome/content/chaika/settings/replacement-manager-new.xul
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+
+<!-- See license.txt for terms of usage -->
+
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://chaika/skin/settings/replacement-manager.css" type="text/css"?>
+
+<dialog id="chaikaReplacementManagerNew"
+        buttons="accept, cancel"
+        buttoniconaccept="save"
+        ondialogaccept="onDialogAccept()"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        onload="startup()"
+        onunload="shutdown()"
+        width="600" height="500"
+        persist="screenX screenY width height">
+
+    <vbox id="editor"></vbox>
+
+    <script type="application/javascript; version=1.7"
+            src="chrome://chaika/content/settings/replacement-manager-new.js"/>
+</dialog>
diff --git a/chaika/chrome/content/chaika/settings/replacement-manager.js b/chaika/chrome/content/chaika/settings/replacement-manager.js
new file mode 100644
index 00000000..6064a080
--- /dev/null
+++ b/chaika/chrome/content/chaika/settings/replacement-manager.js
@@ -0,0 +1,157 @@
+/* See license.txt for terms of usage */
+
+Components.utils.import('resource://gre/modules/Services.jsm');
+Components.utils.import('resource://chaika-modules/ChaikaCore.js');
+Components.utils.import("resource://chaika-modules/ChaikaContentReplacer.js");
+
+const { interfaces: Ci, classes: Cc, results: Cr, utils: Cu } = Components;
+
+
+var gReplacerObserver = {
+    observe: function(aSubject, aTopic, aData){
+        switch(aTopic){
+            case "chaika-replace-rule-add":
+            case "chaika-replace-rule-remove":
+                gReplacementManager.update(aData);
+                break;
+
+            default:
+                return;
+        }
+    }
+};
+
+
+var gReplacementManager = {
+
+    startup: function(){
+        Services.obs.addObserver(gReplacerObserver, "chaika-replace-rule-add", false);
+        Services.obs.addObserver(gReplacerObserver, "chaika-replace-rule-remove", false);
+
+        this._editor = document.getElementById('editor');
+        this._listbox = document.getElementById('rulelist');
+
+        this._listbox.addEventListener('select', this);
+        document.querySelector('.button-add').addEventListener('command', this);
+        document.querySelector('.button-remove').addEventListener('command', this);
+        document.querySelector('.button-save').addEventListener('command', this);
+
+        this._initList();
+
+        window.resizeTo(600, 500);
+    },
+
+
+    shutdown: function(){
+        Services.obs.removeObserver(gReplacerObserver, "chaika-replace-rule-add", false);
+        Services.obs.removeObserver(gReplacerObserver, "chaika-replace-rule-remove", false);
+
+        this._listbox.removeEventListener('select', this);
+        document.querySelector('.button-add').removeEventListener('command', this);
+        document.querySelector('.button-remove').removeEventListener('command', this);
+        document.querySelector('.button-save').removeEventListener('command', this);
+    },
+
+
+    _initList: function(){
+        let rules = ChaikaContentReplacer.getRules();
+
+        while(this._listbox.getRowCount() > 0){
+            this._listbox.removeItemAt(0);
+        }
+
+        rules.forEach((rule) => {
+            this._listbox.appendItem(rule.title, JSON.stringify(rule));
+        });
+
+        if(this._listbox.getRowCount() === 0){
+            //一つも項目がない場合にはユーザーが混乱するのを防ぐため、
+            //データ編集欄を非表示にしておく
+            this._editor.collapsed = true;
+        }else{
+            //先頭を選択
+            setTimeout(() => { this._listbox.selectedIndex = 0; }, 0);
+        }
+    },
+
+
+    handleEvent: function(aEvent){
+        switch(aEvent.type){
+            case 'select':
+                this.populateData(JSON.parse(this._listbox.selectedItem.value), true);
+                break;
+
+            case 'command':
+                switch(aEvent.originalTarget.className){
+                    case 'button-add':
+                        this.add();
+                        break;
+
+                    case 'button-remove':
+                        this.remove();
+                        break;
+
+                    case 'button-save':
+                        this.save();
+                        break;
+                }
+                break;
+        }
+    },
+
+
+    /**
+     * @param {String} updatedData 更新されたデータ (JSON)
+     */
+    update: function(updatedData){
+        this._initList();
+        this._listbox.value = updatedData;
+
+        if(this._listbox.selectedIndex === -1)
+            this._listbox.selectedIndex = 0;
+    },
+
+
+    /**
+     * @param {ReplaceData} aData 表示するデータ
+     * @param {Boolean} inContext ページ内表示かどうか
+     */
+    populateData: function(aData, inContext){
+        if(inContext){
+            this._editor.collapsed = false;
+            this._editor.populateData(aData);
+        }else{
+            //追加ダイアログを表示する
+            this.add(aData);
+        }
+    },
+
+
+    /**
+     * @param {ReplaceData} [dataToPopulate] 予め入力しておくデータ
+     */
+    add: function(dataToPopulate){
+        window.openDialog('chrome://chaika/content/settings/replacement-manager-new.xul',
+                          '_blank', 'modal, resizable', dataToPopulate);
+    },
+
+
+    /**
+     * 選択されているデータを削除する
+     */
+    remove: function(){
+        if(this._listbox.selectedIndex === -1) return;
+
+        ChaikaContentReplacer.remove(JSON.parse(this._listbox.selectedItem.value));
+    },
+
+
+    /**
+     * 編集画面での変更を保存する
+     */
+    save: function(){
+        ChaikaContentReplacer.change(JSON.parse(this._listbox.selectedItem.value),
+                                     this._editor.getReplaceData());
+    },
+
+};
diff --git a/chaika/chrome/content/chaika/settings/replacement-manager.xul b/chaika/chrome/content/chaika/settings/replacement-manager.xul
new file mode 100644
index 00000000..a65bb0e2
--- /dev/null
+++ b/chaika/chrome/content/chaika/settings/replacement-manager.xul
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+
+<!-- See license.txt for terms of usage -->
+
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://chaika/skin/settings/replacement-manager.css" type="text/css"?>
+
+<window id="winMain" title="置換 マネージャ" width="600" height="500"
+    onload="gReplacementManager.startup()" onunload="gReplacementManager.shutdown()"
+    persist="screenX screenY width height"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+    <hbox>
+        <spacer flex="1" />
+        <button label="新規" class="button-add" />
+    </hbox>
+
+    <listbox id="rulelist" />
+
+    <hbox>
+        <spacer flex="1" />
+        <button label="保存" class="button-save" />
+        <button label="削除" class="button-remove" />
+    </hbox>
+
+    <vbox id="editor"></vbox>
+
+    <script type="application/javascript; version=1.7"
+            src="chrome://chaika/content/settings/replacement-manager.js"/>
+</window>
diff --git a/chaika/chrome/content/chaika/settings/thread-pane.xul b/chaika/chrome/content/chaika/settings/thread-pane.xul
index 500493a2..51323fde 100644
--- a/chaika/chrome/content/chaika/settings/thread-pane.xul
+++ b/chaika/chrome/content/chaika/settings/thread-pane.xul
@@ -42,7 +42,7 @@
                     <menupopup style="-moz-binding:url(chrome://chaika/content/skinMenu.xml#skinMenuPopup)" />
                 </menulist>
 
-                <button label="ディレクトリを開く" oncommand="gThreadPane.openSkinDir()"/>
+                <button label="スキンフォルダを開く" oncommand="gThreadPane.openSkinDir()"/>
             </hbox>
             <checkbox label="Be アイコンの表示"
                     preference="extensions.chaika.thread_show_be_icon"/>
diff --git a/chaika/chrome/skin/classic/chaika/browser/browserMenu.css b/chaika/chrome/skin/classic/chaika/browser/browserMenu.css
index 22e37541..b534567d 100644
--- a/chaika/chrome/skin/classic/chaika/browser/browserMenu.css
+++ b/chaika/chrome/skin/classic/chaika/browser/browserMenu.css
@@ -17,6 +17,8 @@ toolbarpaletteitem[place="palette"] > #chaika-toolbarbutton{
 
 /** menuitem's display setting **/
 
+.chaika-browser-menu.chaika-status-hidden .chaika-browser-menu-root > :-moz-any(menu, menuitem, menuseparator),
+.chaika-browser-menu:not(.chaika-status-flattened) .chaika-shown-when-flattened,
 .chaika-browser-menu:not(.chaika-status-text-selected) .chaika-shown-when-text-selected,
 .chaika-browser-menu:not(.chaika-status-on-bbs-link) .chaika-shown-on-bbs-link,
 .chaika-browser-menu:not(.chaika-status-on-bbs) .chaika-shown-on-bbs,
diff --git a/chaika/chrome/skin/classic/chaika/settings/replacement-manager.css b/chaika/chrome/skin/classic/chaika/settings/replacement-manager.css
new file mode 100644
index 00000000..6d92b1a0
--- /dev/null
+++ b/chaika/chrome/skin/classic/chaika/settings/replacement-manager.css
@@ -0,0 +1,31 @@
+/* See license.txt for terms of usage */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+window{
+    padding: 1em;
+}
+
+listbox{
+    height: 150px;
+}
+
+#editor{
+    -moz-binding: url(chrome://chaika/content/settings/replacement-manager-editor.xml#editor);
+}
+
+#special-replacement-patterns-desc{
+    background-color: #33dd00;
+}
+
+.dt{
+    font-weight: bold;
+}
+
+.template{
+    display: none;
+}
+
+.fixed-height{
+    overflow: auto;
+}
diff --git a/chaika/components/chChaikaService.js b/chaika/components/chChaikaService.js
index fa5302ff..9bc832f5 100644
--- a/chaika/components/chChaikaService.js
+++ b/chaika/components/chChaikaService.js
@@ -38,6 +38,9 @@ ChaikaService.prototype = {
         Components.utils.import("resource://chaika-modules/ChaikaAA.js");
         ChaikaAA._startup();
 
+        Components.utils.import("resource://chaika-modules/ChaikaContentReplacer.js");
+        ChaikaContentReplacer._startup();
+
         Components.utils.import("resource://chaika-modules/ChaikaBoard.js");
         Components.utils.import("resource://chaika-modules/ChaikaThread.js");
 
@@ -52,6 +55,7 @@ ChaikaService.prototype = {
 
 
     _quitApp: function ChaikaService__quitApp(){
+        ChaikaContentReplacer._quit();
         ChaikaAA._quit();
         ChaikaRoninLogin._quit();
         ChaikaAboneManager._quit();
diff --git a/chaika/install.rdf b/chaika/install.rdf
index b76635a5..6319a552 100644
--- a/chaika/install.rdf
+++ b/chaika/install.rdf
@@ -4,8 +4,8 @@
 
     <Description about="urn:mozilla:install-manifest"
                  em:name="chaika"
-                 em:version="1.7.0"
-                 em:description="2ch.net(Japanese Web Forums) Browser"
+                 em:version="1.7.1"
+                 em:description="Dedicated browser for 2ch.net (the most popular textboard in Japan)"
                  em:id="chaika@chaika.xrea.jp"
                  em:type="2"
                  em:unpack="true"
@@ -18,7 +18,7 @@
             <!-- Firefox -->
             <Description em:id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
                          em:minVersion="24.0"
-                         em:maxVersion="32.*"/>
+                         em:maxVersion="33.*"/>
         </em:targetApplication>
     </Description>
 </RDF>
diff --git a/chaika/modules/ChaikaAboneManager.js b/chaika/modules/ChaikaAboneManager.js
index 42fdfb4f..9ef81c83 100644
--- a/chaika/modules/ChaikaAboneManager.js
+++ b/chaika/modules/ChaikaAboneManager.js
@@ -111,6 +111,7 @@ AboneData.prototype = {
         if(this._data === null){
             ChaikaCore.logger.error('Fail in converting the encoding of ' + this._ngFile.leafName);
             this._data = "";
+            this._encodingError = true;
         }
 
         this._data = this._data.split('\n')
@@ -119,7 +120,7 @@ AboneData.prototype = {
 
 
     _saveNgData: function(){
-        if(this._data && this._data.length > 0){
+        if(this._data && !this._encodingError){
             ChaikaCore.io.writeString(this._ngFile, 'UTF-8', false, this._data.join("\n"));
         }
     },
@@ -219,7 +220,7 @@ NGExAboneData.prototype = Object.create(AboneData.prototype, {
         value: function(aRule, aResData){
             let target = aResData[aRule.target];
 
-            if(!target){
+            if(typeof target !== 'string'){
                 return false;
             }
 
diff --git a/chaika/modules/ChaikaBoard.js b/chaika/modules/ChaikaBoard.js
index 3e428834..2d4dcf49 100644
--- a/chaika/modules/ChaikaBoard.js
+++ b/chaika/modules/ChaikaBoard.js
@@ -3,6 +3,7 @@
 
 EXPORTED_SYMBOLS = ["ChaikaBoard"];
 Components.utils.import("resource://chaika-modules/ChaikaCore.js");
+Components.utils.import("resource://chaika-modules/ChaikaContentReplacer.js");
 
 
 const Ci = Components.interfaces;
@@ -634,14 +635,30 @@ ChaikaBoard.prototype = {
                 let count = Number(RegExp.$3);
                 let title = RegExp.$2;
 
+
                 title = ChaikaCore.io.unescapeHTML(title);
 
+
                 // JBBS では , が ＠｀ に置換されている
                 if(this.type === ChaikaBoard.BOARD_TYPE_JBBS){
                     //\uff20\uff40 = ＠｀
                     title = title.replace(/\uff20\uff40/g, ',');
                 }
 
+
+                // ユーザー定義の置換
+                let replacedThreadData = ChaikaContentReplacer.replace({
+                    title: title,
+                    board_url: this.url.spec,
+                    isThreadList: false,
+                    isSubjectTxt: true
+                });
+
+                if(replacedThreadData){
+                    title = replacedThreadData.title;
+                }
+
+
                 statement.bindStringParameter(0, threadID);
                 statement.bindStringParameter(1, boardID);
                 statement.bindStringParameter(2, datID);
diff --git a/chaika/modules/ChaikaContentReplacer.js b/chaika/modules/ChaikaContentReplacer.js
new file mode 100644
index 00000000..c96afc7d
--- /dev/null
+++ b/chaika/modules/ChaikaContentReplacer.js
@@ -0,0 +1,224 @@
+/* See license.txt for terms of usage */
+
+EXPORTED_SYMBOLS = ["ChaikaContentReplacer"];
+
+Components.utils.import('resource://gre/modules/Services.jsm');
+Components.utils.import("resource://chaika-modules/ChaikaCore.js");
+Components.utils.import("resource://chaika-modules/ChaikaAboneManager.js");
+
+const { interfaces: Ci, classes: Cc, results: Cr, utils: Cu } = Components;
+
+
+/**
+ * ユーザーによるスレタイ・レスなどの置換を扱う
+ */
+var ChaikaContentReplacer = {
+
+    /**
+     * 置換ルール
+     * @type {Array.<ReplaceData>}
+     */
+    _rule: [],
+
+
+    /**
+     * ブラウザ起動時のプロファイル読み込み後に一度だけ実行され、初期化処理を行う。
+     * @private
+     */
+    _startup: function(){
+        this._uc = Cc["@mozilla.org/intl/scriptableunicodeconverter"]
+                    .createInstance(Ci.nsIScriptableUnicodeConverter);
+        this._uc.charset = "Shift_JIS";
+
+        this._loadData();
+    },
+
+
+    /**
+     * ブラウザ終了時に一度だけ実行され、終了処理を行う。
+     * @private
+     */
+    _quit: function(){
+        this._saveData();
+    },
+
+
+    _loadData: function(){
+        this._file = ChaikaCore.getDataDir();
+        this._file.appendRelativePath('Replace.txt');
+
+        if(!this._file.exists()){
+            this._rules = [];
+            return;
+        }
+
+        this._rules = ChaikaCore.io.readString(this._file).split('\n').filter((item) => !!item);
+
+        this._rules = this._rules.map((json) => {
+            try{
+                return JSON.parse(json);
+            }catch(ex){
+                ChaikaCore.logger.error('Invalid JSON:', json, '\n' + ex);
+                return null;
+            }
+        }).filter((item) => !!item);
+    },
+
+
+    _saveData: function(){
+        if(this._rules){
+            ChaikaCore.io.writeString(this._file, 'UTF-8', false,
+                                      this._rules.map((rule) => JSON.stringify(rule)).join("\n"));
+        }
+    },
+
+
+    getRules: function(){
+        return this._rules;
+    },
+
+
+    /**
+     * ユーザー定義の置換を行う
+     * @param {Object} aResData レスのデータ
+     * @param {String} aResData.name 名前
+     * @param {String} aResData.mail メール
+     * @param {String} aResData.id ID
+     * @param {String} aResData.msg 本文
+     * @param {String} aResData.date 書き込み日時
+     * @param {String} aResData.ip IPアドレス
+     * @param {String} aResData.host ホスト
+     * @param {String} aResData.be BeID
+     * @param {String} aResData.baseBe Be基礎番号
+     * @param {String} aResData.title スレッドタイトル
+     * @param {String} aResData.thread_url スレッドURL
+     * @param {String} aResData.board_url 板URL
+     * @param {Boolean} aResData.isThreadList スレッド一覧での置換なら真
+     * @param {Boolean} aResData.isSubjectTxt suject.txtでの置換なら真
+     * @return {Object|null} 置換された時にはそのレスデータが返る ヒットしなかった場合には null が返る
+     */
+    replace: function(aResData){
+        let replaced = false;
+
+        this._rules.forEach((rule) => {
+            // ルールが置換する対象のデータがそもそもなければ
+            // 条件に一致するかどうかを調べる必要はないのでまずはそれを調べる
+
+            let target = rule.target;
+
+            // スレタイ置換へのターゲット名の調整
+            if((target === 'thread_title_on_list' && aResData.isThreadList) ||
+               (target === 'thread_title_subjecttxt' && aResData.isSubjectTxt)){
+                target = 'title';
+            }
+
+            if(typeof aResData[target] !== 'string') return;
+
+
+            let matched = false;
+
+            if(rule.match === 'all'){
+                matched = rule.rules.every((rule) => this._matchRule(rule, aResData));
+            }else{
+                matched = rule.rules.some((rule) => this._matchRule(rule, aResData));
+            }
+
+            if(matched){
+                // フラグの調整
+                let replaceFlag = '';
+
+                if(rule.ignoreCase) replaceFlag += 'i';
+                if(rule.global) replaceFlag += 'g';
+
+
+                // もともと置換対象に含まれている $ が特殊文字に変換されないようにする
+                aResData[target] = aResData[target].replace('$', '&#36;', 'g');
+
+
+                // 置換
+                if(rule.regexp){
+                    let regexp = new RegExp(rule.searchText, replaceFlag);
+
+                    aResData[target] = aResData[target].replace(regexp, rule.replaceText);
+                }else{
+                    aResData[target] = aResData[target].replace(rule.searchText, rule.replaceText, replaceFlag);
+                }
+
+                replaced = true;
+            }
+        });
+
+        return replaced ? aResData : null;
+    },
+
+
+    /**
+     * レスデータがルールに合致しているかどうか調べる
+     * NGEx と同じシステムなためあちらに処理を移譲する
+     */
+    _matchRule: function(rule, resData){
+        return ChaikaAboneManager.ex._matchRule.call(this, rule, resData);
+    },
+
+
+    /**
+     * 指定したデータを追加する
+     * @param {ReplaceData} aReplaceData
+     */
+    add: function(aReplaceData){
+        //データの補正
+        aReplaceData.rules.forEach((rule) => {
+            if(!rule.regexp && rule.ignoreCase){
+                rule.query = rule.query.toLowerCase();
+            }
+        });
+
+        this._rules.push(aReplaceData);
+        Services.obs.notifyObservers(null, "chaika-replace-rule-add", JSON.stringify(aReplaceData));
+    },
+
+
+    /**
+     * 指定したデータを削除する
+     * @param {ReplaceData} aReplaceData 削除するデータ
+     */
+    remove: function(aReplaceData){
+        let jsonReplaceData = JSON.stringify(aReplaceData);
+        let index = this._rules.map((rule) => JSON.stringify(rule)).indexOf(jsonReplaceData);
+
+        if(index !== -1){
+            this._rules.splice(index, 1);
+            Services.obs.notifyObservers(null, "chaika-replace-rule-remove", jsonReplaceData);
+        }
+    },
+
+
+    /**
+     * 指定したデータを変更する
+     * @param {ReplaceData} oldData 変更するデータ
+     * @param {ReplaceData} newData 変更後のデータ
+     */
+    change: function(oldData, newData){
+        //データの補正
+        newData.rules.forEach((rule) => {
+            if(!rule.regexp && rule.ignoreCase){
+                rule.query = rule.query.toLowerCase();
+            }
+        });
+
+        let jsonOldData = JSON.stringify(oldData);
+        let jsonNewData = JSON.stringify(newData);
+        let index = this._rules.map((rule) => JSON.stringify(rule)).indexOf(jsonOldData);
+
+        if(index === -1){
+            return;
+        }
+
+
+        this._rules[index] = newData;
+
+        Services.obs.notifyObservers(null, "chaika-replace-rule-remove", jsonOldData);
+        Services.obs.notifyObservers(null, "chaika-replace-rule-add", jsonNewData);
+    }
+
+};
diff --git a/chaika/modules/ChaikaCore.js b/chaika/modules/ChaikaCore.js
index 1a59d705..939e2104 100644
--- a/chaika/modules/ChaikaCore.js
+++ b/chaika/modules/ChaikaCore.js
@@ -1161,26 +1161,52 @@ ChaikaIO.prototype = {
     /**
      * HTML実体参照にエンコードする
      * @param {String} aStr エンコードする文字列
-     * @return {String}　エンコード後の文字列
+     * @return {String} エンコード後の文字列
      */
     escapeHTML: function ChaikaCore_escapeHTML(aStr){
-        return aStr.split('&').join('&amp;')
-                    .split('<').join('&lt;')
-                    .split('>').join('&gt;')
-                    .split('"').join('&quot;');
+        return aStr.replace(/&/g, '&amp;')
+                   .replace(/</g, '&lt;')
+                   .replace(/>/g, '&gt;')
+                   .replace(/"/g, '&quot;')
+                   .replace(/'/g, '&#039;')
+                   .replace(/\u00a9/g, '&copy;');
     },
 
 
     /**
      * HTML実体参照をデコードする
      * @param {String} aStr デコードする文字列
-     * @return {String}　デコード後の文字列
+     * @return {String} デコード後の文字列
      */
     unescapeHTML: function ChaikaCore_unescapeHTML(aStr){
-        return aStr.split('&lt;').join('<')
-                    .split('&gt;').join('>')
-                    .split('&quot;').join('"')
-                    .split('&amp;').join('&');
+        return aStr.replace(/&lt;/g, '<')
+                   .replace(/&gt;/g, '>')
+                   .replace(/&quot;/g, '"')
+                   .replace(/&#039;/g, "'")
+                   .replace(/&amp;/g, '&')
+                   .replace(/&copy;/g, this.fromUTF8Octets('©'));
+    },
+
+
+    /**
+     * UTF-8 バイト列から文字列へ変換する
+     * @param {Octets} octets UTF-8 バイト列
+     * @return 文字列
+     * @note http://nanto.asablo.jp/blog/2006/10/23/572458 より
+     */
+    fromUTF8Octets: function(octets){
+        return decodeURIComponent(escape(octets));
+    },
+
+
+    /**
+     * 文字列から UTF-8 バイト列へ変換する
+     * @param {String} string 文字列
+     * @return UTF-8 バイト列
+     * @note http://nanto.asablo.jp/blog/2006/10/23/572458 より
+     */
+    toUTF8Octets: function(string){
+        return unescape(encodeURIComponent(string));
     }
 };
 
diff --git a/chaika/modules/ChaikaHttpController.js b/chaika/modules/ChaikaHttpController.js
index c2e3b5ef..79c13c99 100644
--- a/chaika/modules/ChaikaHttpController.js
+++ b/chaika/modules/ChaikaHttpController.js
@@ -699,9 +699,9 @@ ChaikaNGFiles.prototype = {
             if(this.ngData[i].hash === hash){
                 uri = uri.QueryInterface(Ci.nsIURL);
 
-                var alertStr = decodeURIComponent(escape(
+                var alertStr = ChaikaCore.io.fromUTF8Octets(
                     'NGFiles.txt に基づき ' + uri.fileName + ' をブロックしました。\n説明: '
-                )) + this.ngData[i].description;
+                ) + this.ngData[i].description;
 
                 var alertsService = Cc["@mozilla.org/alerts-service;1"].getService(Ci.nsIAlertsService);
                 alertsService.showAlertNotification("chrome://chaika/content/icon.png", "Chaika", alertStr, false, "", null);
diff --git a/chaika/modules/ChaikaSearch.js b/chaika/modules/ChaikaSearch.js
index 8c9a1786..e8da964f 100644
--- a/chaika/modules/ChaikaSearch.js
+++ b/chaika/modules/ChaikaSearch.js
@@ -244,7 +244,7 @@ var ChaikaSearchPlugin = {
      *
      * 検索結果を取得する用途がない場合、null を指定する
      *
-     * @param {String} term 検索文字列 (エンコード済みでない)
+     * @param {String} term 検索文字列 (URIEncode はされていないが, '<' などは ChaikaIO#escapeHTML により実体参照化されている)
      * @return {Promise} - 成功時: 以下のようなオブジェクトの配列を返す必要がある
      *     [
      *         {
diff --git a/chaika/modules/ChaikaThread.js b/chaika/modules/ChaikaThread.js
index b0ccf8f3..6dd3dd7e 100644
--- a/chaika/modules/ChaikaThread.js
+++ b/chaika/modules/ChaikaThread.js
@@ -4,7 +4,7 @@
 EXPORTED_SYMBOLS = ["ChaikaThread"];
 Components.utils.import("resource://chaika-modules/ChaikaCore.js");
 Components.utils.import("resource://chaika-modules/ChaikaBoard.js");
-
+Components.utils.import("resource://chaika-modules/ChaikaContentReplacer.js");
 
 const Ci = Components.interfaces;
 const Cc = Components.classes;
@@ -89,11 +89,33 @@ ChaikaThread.prototype = {
      * @type nsIFile
      */
     datFile: null,
+
     /**
      *
      * @type String
      */
-    title: null,
+    get title(){
+        if(!this._title) return '';
+
+        let replacedThreadData = ChaikaContentReplacer.replace({
+            title: this._title,
+            thread_url: this.plainURL ? this.plainURL.spec : '',
+            board_url: this.boardURL ? this.boardURL.spec : '',
+            isThreadList: false,
+            isSubjectTxt: true
+        });
+
+        if(replacedThreadData){
+            this._title = replacedThreadData.title;
+        }
+
+        return this._title;
+    },
+
+    set title(title){
+        this._title = title;
+    },
+
     /**
      *
      * @type Number
diff --git a/chaika/modules/server/thread.js b/chaika/modules/server/thread.js
index 90a4fd36..9f5821f0 100644
--- a/chaika/modules/server/thread.js
+++ b/chaika/modules/server/thread.js
@@ -6,6 +6,7 @@ Components.utils.import("resource://chaika-modules/ChaikaBoard.js");
 Components.utils.import("resource://chaika-modules/ChaikaThread.js");
 Components.utils.import("resource://chaika-modules/ChaikaLogin.js");
 Components.utils.import("resource://chaika-modules/ChaikaAboneManager.js");
+Components.utils.import("resource://chaika-modules/ChaikaContentReplacer.js");
 Components.utils.import("resource://chaika-modules/ChaikaHttpController.js");
 
 
@@ -257,7 +258,7 @@ Thread2ch.prototype = {
             if(this.optionsOnes && this.optionsOnes <= this._logLineCount){
                 this._headerResponded = true;
 
-                let title = UniConverter.toSJIS(this.thread.title);
+                let title = UniConverter.toSJIS(ChaikaCore.io.escapeHTML(this.thread.title));
                 let header = this.converter.getHeader(title);
                 this.write(header);
                 this.write(this.datLineParse(datLines[this.optionsOnes-1],
@@ -270,7 +271,7 @@ Thread2ch.prototype = {
             }else if(this.optionsEnd  && this.optionsEnd <= this._logLineCount){
                 this._headerResponded = true;
 
-                let title = UniConverter.toSJIS(this.thread.title);
+                let title = UniConverter.toSJIS(ChaikaCore.io.escapeHTML(this.thread.title));
                 let header = this.converter.getHeader(title);
                 this.write(header);
 
@@ -298,7 +299,7 @@ Thread2ch.prototype = {
                 }else if(this.thread.title){
                     this._headerResponded = true;
 
-                    let title = UniConverter.toSJIS(this.thread.title);
+                    let title = UniConverter.toSJIS(ChaikaCore.io.escapeHTML(this.thread.title));
                     let header = this.converter.getHeader(title);
                     this.write(header);
                 }else{
@@ -383,7 +384,8 @@ Thread2ch.prototype = {
      */
     sanitizeHTML: function(aStr){
         //実体参照を保護する
-        aStr = aStr.replace("&#", " &# ", "g");
+        aStr = aStr.replace("&#", "_&#_", "g")  // &#169; など
+                   .replace(/&([a-zA-Z0-9]+?);/g, '_&_$1;');  // &copy; など
 
         //sanitize
         var doc = this._parser.parseFromString("<html><body></body></html>", 'text/html');
@@ -394,7 +396,8 @@ Thread2ch.prototype = {
         sanitizedStr = sanitizedStr.replace(' xmlns="http://www.w3.org/1999/xhtml"', '', 'g');
 
         //実体参照を元に戻す
-        sanitizedStr = sanitizedStr.replace(" &amp;# ", "&#", "g");
+        sanitizedStr = sanitizedStr.replace("_&amp;#_", "&#", "g")
+                                   .replace(/_&amp;_([a-zA-Z0-9]+?);/g, '&$1;');
 
         // <br /> をもとに戻す
         sanitizedStr = sanitizedStr.replace('<br />', '<br>', 'g');
@@ -436,9 +439,10 @@ Thread2ch.prototype = {
         if(!this._headerResponded && threadTitle){
             this._headerResponded = true;
 
+            // 一旦 ChaikaThread を通して ChaikaContentReplacer を反映させる
             this.thread.title = UniConverter.fromSJIS(threadTitle);
 
-            let header = this.converter.getHeader(threadTitle);
+            let header = this.converter.getHeader(UniConverter.toSJIS(this.thread.title));
             this.write(header);
             this._handler.response.flush();
         }
@@ -573,6 +577,46 @@ Thread2ch.prototype = {
             }
         }
 
+
+        //ユーザー定義の置換
+        let replacedResData = ChaikaContentReplacer.replace({
+            name: UniConverter.fromSJIS(resName),
+            mail: UniConverter.fromSJIS(resMail),
+            id: resID,
+            msg: UniConverter.fromSJIS(resMes),
+            date: UniConverter.fromSJIS(resDate),
+            ip: resIP,
+            host: resHost,
+            be: resBeID + '',
+            baseBe: resBeBaseID + '',
+            title: this.thread.title,
+            thread_url: this.thread.plainURL.spec,
+            board_url: this.thread.boardURL.spec,
+            isThreadList: false,
+            isSubjectTxt: false
+        });
+
+        if(replacedResData){
+            [
+                resName,
+                resMail,
+                resDate,
+                resIP,
+                resHost,
+                resMes,
+                resID
+            ] = [
+                UniConverter.toSJIS(replacedResData.name),
+                UniConverter.toSJIS(replacedResData.mail),
+                UniConverter.toSJIS(replacedResData.date),
+                UniConverter.toSJIS(replacedResData.ip),
+                UniConverter.toSJIS(replacedResData.host),
+                UniConverter.toSJIS(replacedResData.msg),
+                UniConverter.toSJIS(replacedResData.id),
+            ];
+        }
+
+
         // JSでは "\" が特殊な意味を持つため、数値文字参照に変換
         resName = resName.replace(/([^\x81-\xfc]|^)\x5C/g,"$1&#x5C;");
         resMail = resMail.replace(/([^\x81-\xfc]|^)\x5C/g,"$1&#x5C;");