diff --git a/core/src/plugins/editor.etherpad/class.EtherpadClient.php b/core/src/plugins/editor.etherpad/class.EtherpadClient.php
index 6851cc6f73..850009d516 100644
--- a/core/src/plugins/editor.etherpad/class.EtherpadClient.php
+++ b/core/src/plugins/editor.etherpad/class.EtherpadClient.php
@@ -31,69 +31,70 @@ public function switchAction($actionName, $httpVars, $fileVars)
         $this->baseURL = rtrim($this->getFilteredOption("ETHERPAD_SERVER"), "/");
         $this->apiKey =  $this->getFilteredOption("ETHERPAD_APIKEY");
 
-        if (isSet($httpVars["file"])) {
-
-            $repository = ConfService::getRepository();
-            if (!$repository->detectStreamWrapper(false)) {
-                return false;
-            }
-            $plugin = AJXP_PluginsService::findPlugin("access", $repository->getAccessType());
-            $streamData = $plugin->detectStreamWrapper(true);
-            $destStreamURL = $streamData["protocol"]."://".$repository->getId()."/";
-            $filename = $destStreamURL. AJXP_Utils::securePath($httpVars["file"]);
-
-            if (!is_file($filename)) {
-                throw new Exception("Cannot find file!");
+        $userSelection = new UserSelection(ConfService::getRepository(), $httpVars);
+        if ($userSelection->isEmpty()){
+            throw new Exception("Empty selection");
+        }
+        $repository = ConfService::getRepository();
+        if (!$repository->detectStreamWrapper(false)) {
+            return false;
+        }
+        $plugin = AJXP_PluginsService::findPlugin("access", $repository->getAccessType());
+        $selectedNode = $userSelection->getUniqueNode($plugin);
+        $selectedNode->loadNodeInfo();
+        if(!$selectedNode->isLeaf()){
+            throw new Exception("Cannot handle folders, please select a file!");
+        }
+        $nodeExtension = strtolower(pathinfo($selectedNode->getPath(), PATHINFO_EXTENSION));
+
+        // Determine pad ID
+        if($nodeExtension == "pad"){
+            $padID = file_get_contents($selectedNode->getUrl());
+        }else{
+            // TRY TO LOAD PAD ID FROM NODE SHARED METADATA
+            $metadata = $selectedNode->retrieveMetadata("etherpad", AJXP_METADATA_ALLUSERS, AJXP_METADATA_SCOPE_GLOBAL, false);
+            if(isSet($metadata["pad_id"])){
+                $padID = $metadata["pad_id"];
+            }else{
+                $padID = AJXP_Utils::generateRandomString();
+                $selectedNode->setMetadata("etherpad", array("pad_id" => $padID), AJXP_METADATA_ALLUSERS, AJXP_METADATA_SCOPE_GLOBAL, false);
             }
         }
 
         require_once("etherpad-client/etherpad-lite-client.php");
         $client = new EtherpadLiteClient($this->apiKey,$this->baseURL."/api");
-        $userName = AuthService::getLoggedUser()->getId();
-        $res = $client->createAuthorIfNotExistsFor($userName, $userName);
+        $loggedUser = AuthService::getLoggedUser();
+        $userName = $loggedUser->getId();
+        $userLabel = $loggedUser->mergedRole->filterParameterValue("core.conf", "USER_DISPLAY_NAME", AJXP_REPO_SCOPE_ALL, $userName);
+        $res = $client->createAuthorIfNotExistsFor($userName, $userLabel);
         $authorID = $res->authorID;
-        $res2 = $client->createGroupIfNotExistsFor("ajaxplorer");
+        $res2 = $client->createGroupIfNotExistsFor($loggedUser->getGroupPath());
         $groupID = $res2->groupID;
+        $fullId = $groupID."$".$padID;
 
         if ($actionName == "etherpad_create") {
 
-            if (isSet($httpVars["pad_name"])) {
-
-                $padID = $httpVars["pad_name"];
-                $startContent = "";
-                if ($httpVars["pad_type"] && $httpVars["pad_type"] == 'free') {
-                    $padID = "FREEPAD__".$padID;
-                }
-
-            } else if (isSet($httpVars["file"])) {
-
-                $startContent = file_get_contents($filename);
-                if (strtolower(pathinfo($filename, PATHINFO_EXTENSION)) == "html") {
-                    $startContentHTML = $startContent;
-                }
-                $padID = AJXP_Utils::slugify($httpVars["file"]);
+            $resP = $client->listPads($groupID);
 
+            $currentContent = file_get_contents($selectedNode->getUrl());
+            if($nodeExtension == "html" && strpos($currentContent, "<html>") === false){
+               $currentContent = "<html><head></head><body>$currentContent</body></html>";
             }
-
-
-            $resP = $client->listPads($res2->groupID);
-
-            $pads = $resP->padIDs;
-            if (!in_array($groupID.'$'.$padID, $pads)) {
-                $res3 = $client->createGroupPad($groupID, $padID, null);
-                if (isSet($startContentHTML)) {
-                    $client->setHTML($groupID.'$'.$padID, $startContentHTML);
-                } else if (!empty($startContent)) {
-                    $client->setText($groupID.'$'.$padID, $startContent);
+            if (!in_array($fullId, $resP->padIDs)) {
+                $client->createGroupPad($groupID, $padID, null);
+                if($nodeExtension == "html" && !empty($currentContent)){
+                    $client->setHTML($fullId, $currentContent);
+                }else if($nodeExtension != "pad"){
+                    $client->setText($fullId, $currentContent);
                 }
-            } else {
-                // Check if content needs relaunch!
-                $test = $client->getText($groupID.'$'.$padID);
-                if (!empty($startContent) && $test->text != $startContent) {
-                    if (isSet($startContentHTML)) {
-                        $client->setHTML($groupID.'$'.$padID, $startContentHTML);
-                    } else {
-                        $client->setText($groupID.'$'.$padID, $startContent);
+            } else if($nodeExtension != "pad") {
+                // If someone is already connected, do not override.
+                $existingAuthors = $client->listAuthorsOfPad($fullId);
+                if(!count($existingAuthors->authorIDs)){
+                    if($nodeExtension == "html" && !empty($currentContent)){
+                        $client->setHTML($fullId, $currentContent);
+                    }else{
+                        $client->setText($fullId, $currentContent);
                     }
                 }
             }
@@ -116,22 +117,39 @@ public function switchAction($actionName, $httpVars, $fileVars)
 
         } else if ($actionName == "etherpad_save") {
 
-            $node = new AJXP_Node($filename);
-
             $padID = $httpVars["pad_id"];
-            if (isSet($startContentHTML)) {
+
+            if ($nodeExtension == "html" || $nodeExtension == "pad") {
                 $res = $client->getHTML($padID);
+                $content = $res->html;
             } else {
                 $res = $client->getText($padID);
+                $content = $res->text;
+            }
+
+            if($nodeExtension == "pad"){
+                // Create a new file and save the content in it.
+                $origUrl = $selectedNode->getUrl();
+                $mess = ConfService::getMessages();
+                $dateStamp = date(" Y-m-d H:i", time());
+                $startUrl = preg_replace('"\.pad$"', $dateStamp.'.html', $origUrl);
+                $newNode = new AJXP_Node($startUrl);
+                AJXP_Controller::applyHook("node.before_create", array($newNode, strlen($content)));
+                file_put_contents($newNode->getUrl(), $content);
+                AJXP_Controller::applyHook("node.change", array(null, $newNode));
+            }else{
+                AJXP_Controller::applyHook("node.before_change", array($selectedNode, strlen($content)));
+                file_put_contents($selectedNode->getUrl(), $content);
+                clearstatcache(true, $selectedNode->getUrl());
+                $selectedNode->loadNodeInfo(true);
+                AJXP_Controller::applyHook("node.change", array($selectedNode, $selectedNode));
             }
 
-            AJXP_Controller::applyHook("node.before_change", array($node, strlen($res->text)));
-            file_put_contents($filename, $res->text);
-            AJXP_Controller::applyHook("node.change", array($node, $node));
 
         } else if ($actionName == "etherpad_close") {
 
             // WE SHOULD DETECT IF THERE IS NOBODY CONNECTED ANYMORE, AND DELETE THE PAD.
+            // BUT SEEMS LIKE THERE'S NO WAY TO PROPERLY REMOVE AN AUTHOR VIA API
             $sessionID = $httpVars["session_id"];
             $client->deleteSession($sessionID);
 
@@ -145,9 +163,24 @@ public function switchAction($actionName, $httpVars, $fileVars)
             HTMLWriter::charsetHeader("application/json");
             echo(json_encode($res));
 
+        } else if ($actionName == "etherpad_get_content"){
+
+            HTMLWriter::charsetHeader("text/plain");
+            echo $client->getText($httpVars["pad_id"])->text;
+
         }
 
-    }
+        return null;
 
+    }
 
+    /**
+     * @param AJXP_Node $ajxpNode
+     */
+    public function hideExtension(&$ajxpNode){
+        if(strtolower(pathinfo($ajxpNode->getPath(), PATHINFO_EXTENSION)) == "pad"){
+            $baseName = AJXP_Utils::safeBasename($ajxpNode->getPath());
+            $ajxpNode->setLabel(str_replace(".pad", "", $baseName));
+        }
+    }
 }
diff --git a/core/src/plugins/editor.etherpad/class.EtherpadLauncher.js b/core/src/plugins/editor.etherpad/class.EtherpadLauncher.js
index 6ccfb91f4f..45c357b036 100644
--- a/core/src/plugins/editor.etherpad/class.EtherpadLauncher.js
+++ b/core/src/plugins/editor.etherpad/class.EtherpadLauncher.js
@@ -28,8 +28,9 @@ Class.create("EtherpadLauncher", AbstractEditor, {
 		$super(oFormObject, options);
 		if(!ajaxplorer.user || ajaxplorer.user.canWrite()){
 			this.canWrite = true;
-			this.actions.get("saveButton").observe('click', function(){
-				this.saveFile();
+			this.actions.get("saveButton").observe('click', function(e){
+                Event.stop(e);
+                this.saveFile();
 				return false;
 			}.bind(this));		
 		}else{
@@ -38,6 +39,7 @@ Class.create("EtherpadLauncher", AbstractEditor, {
 		}
         if(options.context.__className == "Modal"){
             this.actions.get("downloadFileButton").observe('click', function(){
+                Event.stop(e);
                 if(!this.currentFile) return false;
                 ajaxplorer.triggerDownload(ajxpBootstrap.parameters.get('ajxpServerAccess')+'&action=download&file='+this.currentFile);
                 return false;
@@ -47,82 +49,29 @@ Class.create("EtherpadLauncher", AbstractEditor, {
         }
 	},
 
-    initEmptyPadPane : function(form){
-
-        var selector = form.down('[name="pad_list"]');
-        var textInput = form.down('[name="new_pad_name"]');
-        var joinButton = form.down('#join_pad');
-        fitHeightToBottom(form.down("#ether_frame"), null, null, true);
-
-        var con = new Connexion();
-        con.setParameters(new Hash({
-            get_action: 'etherpad_proxy_api',
-            api_action: 'list_pads'
-        }));
-        con.onComplete = function(transport){
-            var pads = $A(transport.responseJSON.padIDs);
-            var frees = $A();
-            var files = $A();
-            pads.each(function(el){
-                var label = el.split('$').pop();
-                if(label.startsWith('FREEPAD__')){
-                    frees.push(label);
-                }else{
-                    files.push(label);
-                }
-            });
-            selector.insert(new Element('optgroup',{label:MessageHash['etherpad.5']}));
-            frees.each(function(e){
-                selector.insert(new Element('option', {value:e}).update(e.replace('FREEPAD__', '')));
-            });
-            selector.insert(new Element('option', {value:-1}).update(MessageHash['etherpad.9']));
-
-            if(files.size()){
-                selector.insert(new Element('optgroup', {label:MessageHash['etherpad.6']}));
-                files.each(function(e){
-                    selector.insert(new Element('option', {value:e}).update(e));
-                });
-            }
-
-            selector.observe("change", function(){
-                textInput[(selector.getValue() == -1)?'show':'hide']();
-            });
-            textInput[(selector.getValue() == -1)?'show':'hide']();
-        };
-        con.sendAsync();
-
-        joinButton.observe("click", function(){
-
-            var conn = new Connexion();
-            conn.addParameter("get_action", "etherpad_create");
-            if(selector.getValue() == -1){
-                conn.addParameter("pad_name", textInput.getValue());
-                conn.addParameter("pad_type", 'free');
-            }else{
-                conn.addParameter("pad_name", selector.getValue());
-            }
-            conn.onComplete = function(transport){
-                var data = transport.responseJSON;
-                $("etherpad_container").down("#ether_frame").src = data.url;
-            };
-            conn.sendAsync();
-        });
-
-    },
-	
 	open : function($super, nodeOrNodes){
 		$super(nodeOrNodes);
         this.node = nodeOrNodes;
+        var frame = this.element.down('#ether_box_frame');
 		var fileName = nodeOrNodes.getPath();
         var conn = new Connexion();
+        var extension = getFileExtension(fileName);
+        if(extension == "pad"){
+            // Replace 'Save' by 'Export'
+            this.actions.get("saveButton").down(".actionbar_button_label").update(MessageHash['etherpad.10']);
+        }
         conn.addParameter("get_action", "etherpad_create");
         conn.addParameter("file", fileName);
         conn.onComplete = function(transport){
             var data = transport.responseJSON;
             this.padID = data.padID;
             this.sessionID = data.sessionID;
-            $("ether_box").down("#ether_box_frame").src = data.url;
-            fitHeightToBottom($("ether_box").down("#ether_box_frame"));
+            console.log(data.url + '?format=text');
+            frame.src = data.url;
+            fitHeightToBottom(frame, null, 25);
+            if(extension != "pad"){
+                this.pe = new PeriodicalExecuter(this.observeChanges.bind(this), 5);
+            }
         }.bind(this);
         conn.sendAsync();
 
@@ -132,13 +81,13 @@ Class.create("EtherpadLauncher", AbstractEditor, {
 		}
 
         this.element.observe("editor:enterFSend", function(){
-            fitHeightToBottom($("ether_box").down("#ether_box_frame"));
+            fitHeightToBottom(frame, null, 25);
         });
         this.element.observe("editor:resize", function(){
-            fitHeightToBottom($("ether_box").down("#ether_box_frame"));
+            fitHeightToBottom(frame, null, 25);
         });
         this.element.observe("editor:exitFSend", function(){
-            fitHeightToBottom($("ether_box").down("#ether_box_frame"));
+            fitHeightToBottom(frame, null, 25);
         });
 
         this.element.observeOnce("editor:close", function(){
@@ -148,7 +97,12 @@ Class.create("EtherpadLauncher", AbstractEditor, {
             conn.addParameter("pad_id", this.padID);
             conn.addParameter("session_id", this.sessionID);
             conn.sendAsync();
+            if(this.pe){
+                this.pe.stop();
+            }
         }.bind(this));
+
+        this.updateTitle(getBaseName(fileName));
 	},
 	
 
@@ -159,6 +113,25 @@ Class.create("EtherpadLauncher", AbstractEditor, {
         conn.addParameter("file", this.node.getPath());
         conn.addParameter("pad_id", this.padID);
         conn.sendAsync();
-	}
+        this.setModified(false);
+	},
+
+    observeChanges: function(){
+        if(!this.padID || !this.node) return;
+        var conn = new Connexion();
+        conn.discrete = true;
+        conn.onComplete = function(transport){
+            var content = transport.responseText;
+            if(this.previousContent && this.previousContent != content){
+                this.setModified(true);
+            }
+            this.previousContent = content;
+        }.bind(this);
+        conn.addParameter("get_action", "etherpad_get_content");
+        conn.addParameter("file", this.node.getPath());
+        conn.addParameter("pad_id", this.padID);
+        conn.sendAsync();
+
+    }
 	
 });
\ No newline at end of file
diff --git a/core/src/plugins/editor.etherpad/discussion.png b/core/src/plugins/editor.etherpad/discussion.png
new file mode 100644
index 0000000000..218e6a349f
Binary files /dev/null and b/core/src/plugins/editor.etherpad/discussion.png differ
diff --git a/core/src/plugins/editor.etherpad/i18n/de.php b/core/src/plugins/editor.etherpad/i18n/de.php
index a76bb5b16c..9f4d563cba 100644
--- a/core/src/plugins/editor.etherpad/i18n/de.php
+++ b/core/src/plugins/editor.etherpad/i18n/de.php
@@ -29,5 +29,6 @@
     "6" => "Dateien",
     "7" => "Beitreten",
     "8" => "Board name",
-    "9" => "Neues Board erstellen",
+    "9" => "You can also create <a>new discussion board</a>",
+    "10" => "Export"
 );
diff --git a/core/src/plugins/editor.etherpad/i18n/en.php b/core/src/plugins/editor.etherpad/i18n/en.php
index 383be36061..25512cea25 100644
--- a/core/src/plugins/editor.etherpad/i18n/en.php
+++ b/core/src/plugins/editor.etherpad/i18n/en.php
@@ -29,5 +29,6 @@
     "6" => "Files",
     "7" => "Join",
     "8" => "Board name",
-    "9" => "Create new board",
+    "9" => "You can also create <a>new discussion board</a>",
+    "10" => "Export"
 );
diff --git a/core/src/plugins/editor.etherpad/i18n/fr.php b/core/src/plugins/editor.etherpad/i18n/fr.php
index 18a66344c7..b819e6601a 100755
--- a/core/src/plugins/editor.etherpad/i18n/fr.php
+++ b/core/src/plugins/editor.etherpad/i18n/fr.php
@@ -29,5 +29,6 @@
     "6" => "Fichiers",
     "7" => "Rejoindre",
     "8" => "Nom de l'adroise",
-    "9" => "Créer une nouvelle ardoise",
+    "9" => "Vous pouvez aussi <a>créer une nouvelle ardoise de discussion</a>",
+    "10" => "Exporter"
 );
diff --git a/core/src/plugins/editor.etherpad/i18n/it.php b/core/src/plugins/editor.etherpad/i18n/it.php
index 99a8fc565d..b3a238747e 100644
--- a/core/src/plugins/editor.etherpad/i18n/it.php
+++ b/core/src/plugins/editor.etherpad/i18n/it.php
@@ -29,5 +29,6 @@
     "6" => "File",
     "7" => "Entra",
     "8" => "Nome Sessione",
-    "9" => "Crea Nuova Sessione",
+    "9" => "You can also create <a>new discussion board</a>",
+    "10" => "Export"
 );
diff --git a/core/src/plugins/editor.etherpad/i18n/pt.php b/core/src/plugins/editor.etherpad/i18n/pt.php
index 1d52061733..c554ca1e76 100644
--- a/core/src/plugins/editor.etherpad/i18n/pt.php
+++ b/core/src/plugins/editor.etherpad/i18n/pt.php
@@ -29,5 +29,6 @@
     "6" => "Ficheiros",
     "7" => "Juntar",
     "8" => "Nome da Área",
-    "9" => "Criar uma nova Área",
+    "9" => "You can also create <a>new discussion board</a>",
+    "10" => "Export"
 );
diff --git a/core/src/plugins/editor.etherpad/manifest.xml b/core/src/plugins/editor.etherpad/manifest.xml
index 2de9be9e0f..c7740fdb72 100644
--- a/core/src/plugins/editor.etherpad/manifest.xml
+++ b/core/src/plugins/editor.etherpad/manifest.xml
@@ -7,6 +7,7 @@
         <resources>
             <js file="plugins/editor.etherpad/class.EtherpadLauncher.js" className="EtherpadLauncher" autoload="true"/>
             <i18n path="plugins/editor.etherpad/i18n" namespace="etherpad"/>
+            <img_library alias="etherpad" path="plugins/editor.etherpad"/>
         </resources>
 	</client_settings>
     <server_settings>
@@ -41,6 +42,7 @@
 				<a href="#" onclick="return false;" class="icon-download" id="downloadFileButton"><img width="22" height="22" src="AJXP_THEME_FOLDER/images/actions/22/download_manager.png" alt="AJXP_MESSAGE[88]" border="0"><br><span message_id="88">AJXP_MESSAGE[88]</span></a>
 			</div>
 			<iframe id="ether_box_frame" style="width:100%;border: none;" src=""></iframe>
+			<div class="ether_box_bottom" style="background-color: #F2F2F2;  height: 25px;  border-top: 1px solid #CCC;  margin-top: -3px;"></div>
 		</div>
 	]]></clientForm>
 	<dependencies>
@@ -50,29 +52,7 @@
     <registry_contributions>
         <actions>
             <action name="etherpad_create">
-                <gui src="" text="etherpad.1" title="etherpad.1b" iconClass="icon-comments-alt">
-                    <context dir="true" recycle="true" selection="false" actionBarGroup="utils" ajxpWidgets="UserWidget::logging_string"/>
-                </gui>
                 <processing>
-                    <clientCallback prepareModal="true" dialogOkButtonOnly="true" dialogOpenForm="etherpad_container">
-                        <dialogOnOpen><![CDATA[
-                            EtherpadLauncher.prototype.initEmptyPadPane(modal.getForm());
-                        ]]></dialogOnOpen>
-                        <dialogOnComplete><![CDATA[
-                            $("etherpad_container").down("#ether_frame").remove();
-                            hideLightBox();
-                        ]]></dialogOnComplete>
-                        <dialogOnCancel><![CDATA[]]></dialogOnCancel>
-                    </clientCallback>
-                    <clientForm id="etherpad_container"><![CDATA[
-                            <div id="etherpad_container" box_width="80%" box_height="80%" box_resize="true" box_padding="0">
-                                <div class="action_bar" style="padding-left: 10px;border-bottom: 1px solid #ccc;padding-bottom: 5px;">
-                                    AJXP_MESSAGE[etherpad.4]<select name="pad_list"></select> <input type="text" name="new_pad_name" placeholder="AJXP_MESSAGE[etherpad.8]" style="display:none;">
-                                    <a id="join_pad" style="float:none;" class="icon-comments-alt" href="#" title="Join" style=""><span message_id="235" class="actionbar_button_label">AJXP_MESSAGE[etherpad.7]</span></a>
-                                </div>
-                                <iframe id="ether_frame" style="width:100%;border: none;" src=""></iframe>
-                            </div>
-                    ]]></clientForm>
                     <serverCallback methodName="switchAction"/>
                 </processing>
             </action>
@@ -81,6 +61,11 @@
                     <serverCallback methodName="switchAction"/>
                 </processing>
             </action>
+            <action name="etherpad_get_content">
+                <processing>
+                    <serverCallback methodName="switchAction"/>
+                </processing>
+            </action>
             <action name="etherpad_close">
                 <processing>
                     <serverCallback methodName="switchAction"/>
@@ -91,7 +76,55 @@
                     <serverCallback methodName="switchAction"/>
                 </processing>
             </action>
+            <action name="mkpad">
+                <gui text="etherpad.1" title="etherpad.1b" src="filenew.png" accessKey="file_access_key" iconClass="icon-file-alt" hasAccessKey="false">
+                    <context selection="false" dir="true" recycle="hidden" actionBar="false"
+                             contextMenu="false" infoPanel="false" actionBarGroup="create" inZip="false"/>
+                </gui>
+                <rightsContext noUser="true" userLogged="only" read="true" write="true" adminOnly=""/>
+                <processing>
+                    <clientCallback prepareModal="true"><![CDATA[
+                    modal.showDialogForm('Create', 'mkpad_form', null, function(){
+                        var oForm = modal.getForm();
+                        oForm.down("#filename").setValue(oForm.down("#filename").getValue()+ '.pad');
+                        var d = new Date().getTime();
+                        var uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
+                            var r = (d + Math.random()*16)%16 | 0;
+                            d = Math.floor(d/16);
+                            return (c=='x' ? r : (r&0x7|0x8)).toString(16);
+                        });
+                        oForm.down("#content").setValue(uuid);
+                        ajaxplorer.actionBar.submitForm(oForm);
+                        hideLightBox(true);
+                        return false;
+                    });
+                ]]></clientCallback>
+                    <clientForm id="mkpad_form"><![CDATA[
+                    <div id="mkpad_form" action="mkfile">
+                        <div class="dialogLegend" ajxp_message_id="etherpad.8">AJXP_MESSAGE[etherpad.8]</div>
+                        <input type="text" id="filename" style="width:390px;" name="filename" value="">
+                        <input type="hidden" id="content" name="content" value="">
+                    </div>
+                ]]></clientForm>
+                    <clientListener name="init"><![CDATA[
+                    document.observe("ajaxplorer:afterApply-mkdir", function(){
+                        if(modal.getForm().down("#alt_mkpad")) return;
+                        var link = '<div class="dialogLegend" style="padding-top:20px;" id="alt_mkpad"><span class="icon-chevron-right"></span> '+MessageHash["etherpad.9"]+'</div>';
+                        modal.getForm().down("div.dialogButtons").insert({before:link});
+                        modal.getForm().down("#alt_mkpad").down("a").addClassName("create_file_alt_link").observe("click", function(){
+                            ajaxplorer.actionBar.fireAction("mkpad");
+                        });
+                    });
+                ]]></clientListener>
+                </processing>
+            </action>
         </actions>
+        <extensions>
+            <extension icon="etherpad/discussion.png" messageId="etherpad.1" mime="pad"/>
+        </extensions>
+        <hooks>
+            <serverCallback methodName="hideExtension" hookName="node.info"/>
+        </hooks>
     </registry_contributions>
     <class_definition classname="EtherpadClient" filename="plugins/editor.etherpad/class.EtherpadClient.php"/>
 </editor>