diff --git a/content/buffers.js b/content/buffer.js
similarity index 100%
rename from content/buffers.js
rename to content/buffer.js
diff --git a/content/mail.js b/content/mail.js
index 4b2a1e20..f2312b70 100644
--- a/content/mail.js
+++ b/content/mail.js
@@ -48,10 +48,21 @@ vimperator.Mail = function ()
     ////////////////////// MAPPINGS ////////////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
 
-    vimperator.mappings.addDefault([vimperator.modes.NORMAL], ["<Return>", "<Space>"], "Focus message",
+    vimperator.mappings.addDefault([vimperator.modes.NORMAL], ["<Return>", "<Space>"],
+        "Focus message",
         function () { content.focus(); }
     );
 
+    // FIXME:the following mappings do not yet work!
+    vimperator.mappings.addDefault([vimperator.modes.NORMAL], ["r"],
+        "Reply to sender",
+        function () { goDoCommand("cmd_reply"); }
+    );
+    vimperator.mappings.addDefault([vimperator.modes.NORMAL], ["d", "<Del>"],
+        "Move mail to Trash folder",
+        function () { goDoCommand("cmd_delete"); }
+    );
+
     /////////////////////////////////////////////////////////////////////////////}}}
     ////////////////////// PUBLIC SECTION //////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
diff --git a/content/mappings.js b/content/mappings.js
index 7c8c61a7..559a1e5c 100644
--- a/content/mappings.js
+++ b/content/mappings.js
@@ -200,7 +200,7 @@ vimperator.Mappings = function () //{{{
 
         addDefault: function (modes, keys, description, action, extra)
         {
-            addMap (new vimperator.Map([vimperator.modes.NORMAL], keys,
+            addMap (new vimperator.Map(modes, keys,
                     action, { shortHelp: description }), false);
         },
 
diff --git a/content/muttator.xul b/content/muttator.xul
index 103b705a..b280be23 100644
--- a/content/muttator.xul
+++ b/content/muttator.xul
@@ -40,7 +40,7 @@ the terms of any one of the MPL, the GPL or the LGPL.
     <script type="application/x-javascript;version=1.8" src="vim.js"/>
     <script type="application/x-javascript;version=1.8" src="muttator.js"/>
 
-    <script type="application/x-javascript;version=1.8" src="buffers.js"/>
+    <script type="application/x-javascript;version=1.8" src="buffer.js"/>
     <script type="application/x-javascript;version=1.8" src="commands.js"/>
     <script type="application/x-javascript;version=1.8" src="completion.js"/>
     <script type="application/x-javascript;version=1.8" src="editor.js"/>
@@ -49,10 +49,10 @@ the terms of any one of the MPL, the GPL or the LGPL.
     <script type="application/x-javascript;version=1.8" src="help.js"/>
     <script type="application/x-javascript;version=1.8" src="hints.js"/>
     <script type="application/x-javascript;version=1.8" src="io.js"/>
+    <script type="application/x-javascript;version=1.8" src="mail.js"/>
     <script type="application/x-javascript;version=1.8" src="mappings.js"/>
     <script type="application/x-javascript;version=1.8" src="modes.js"/>
     <script type="application/x-javascript;version=1.8" src="options.js"/>
-    <script type="application/x-javascript;version=1.8" src="mail.js"/>
     <script type="application/x-javascript;version=1.8" src="ui.js"/>
     <script type="application/x-javascript;version=1.8" src="util.js"/>
 
diff --git a/content/vimperator.xul b/content/vimperator.xul
index 5858172d..d5fdedf2 100644
--- a/content/vimperator.xul
+++ b/content/vimperator.xul
@@ -41,7 +41,7 @@ the terms of any one of the MPL, the GPL or the LGPL.
     <script type="application/x-javascript;version=1.8" src="vimperator.js"/>
 
     <script type="application/x-javascript;version=1.8" src="bookmarks.js"/>
-    <script type="application/x-javascript;version=1.8" src="buffers.js"/>
+    <script type="application/x-javascript;version=1.8" src="buffer.js"/>
     <script type="application/x-javascript;version=1.8" src="commands.js"/>
     <script type="application/x-javascript;version=1.8" src="completion.js"/>
     <script type="application/x-javascript;version=1.8" src="editor.js"/>