diff --git a/chrome/content/vimperator/commands.js b/chrome/content/vimperator/commands.js
index f236b696..cf6e11cc 100644
--- a/chrome/content/vimperator/commands.js
+++ b/chrome/content/vimperator/commands.js
@@ -198,7 +198,7 @@ var g_commands = [/*{{{*/
     ],
     [
         ["javascript", "js"],
-        ["javascript {cmd}", "javascript &lt;&lt; {endpattern}<br/>{script}<br/>{endpattern}"],
+        ["javascript {cmd}", "javascript <<{endpattern}\\n{script}\\n{endpattern}"], // \\n is changed to <br> in the help.js code
         "Run any javascript command through eval()",
         "Acts as a javascript interpreter by passing the argument to <code>eval()</code>.<br/>" +
         "<code>:javascript alert('Hello world')</code> would show a dialog box with the text \"Hello world\".<br/>" +
@@ -654,14 +654,14 @@ var g_mappings = [/*{{{*/
     [ 
         ["ZQ"],
         ["ZQ"],
-        "Quit Vimperator, no matter how many tabs/windows are open. The session is not stored.",
+        "Quit and don't save the session",
         "Works like <code class=command>:qall</code>.",
         function(count) { quit(false); }
     ],
     [ 
         ["ZZ"],
         ["ZZ"],
-        "Save the session and quit",
+        "Quit and save the session",
         "Quit Vimperator, no matter how many tabs/windows are open. The session is stored.<br/>" +
         "Works like <code class=command>:xall</code>.",
         function(count) { quit(true); }
@@ -699,7 +699,7 @@ var g_mappings = [/*{{{*/
     [ 
         ["h", "<Left>"],
         ["{count}h", "{count}<Left>"],
-        "Scroll document to the left" +
+        "Scroll document to the left",
         "Count is supported: <code class=mapping>10h</code> will move 10 times as much to the left.",
         "If the document cannot scroll more, a beep is emmited (unless <code class=setting>'beep'</code> is turned off).",
         function(count) { scrollBufferRelative(-1, 0); }
diff --git a/chrome/content/vimperator/help.js b/chrome/content/vimperator/help.js
index 4d086e97..a058951e 100644
--- a/chrome/content/vimperator/help.js
+++ b/chrome/content/vimperator/help.js
@@ -86,8 +86,12 @@ function help(section, easter)
             {
                 var usage = commands[i][USAGE][j];
 
-                usage = usage.replace(/<(?!br\/>)/g, "&lt;");
-                usage = usage.replace(/[^b][^r][^\/]>/g, "&gt;");
+                // keep <br/>
+                //usage = usage.replace(/<([^b][^r].*>)/g, "&lt;$1");
+                //usage = usage.replace(/[^b][^r][^\/]>/g, "&gt;");
+                usage = usage.replace(/</g, "&lt;");
+                usage = usage.replace(/>/g, "&gt;");
+                usage = usage.replace(/\\n/g, "<br/>");
                 // color {count} and [url] arguments in the usage, not nice and error prone but the regexp work (for now)
                 usage = usage.replace(/(^|;|\n|\s|\]|\}|=|<br\/?>)({.*?}|\[.*?\])/gm, "$1<span class=argument>$2</span>");
                 // and the 'setting' in a different color