diff -urN browzmi.0.3.8/chrome/content/browzmi.xul browzmi.0.3.8.mod/chrome/content/browzmi.xul
--- browzmi.0.3.8/chrome/content/browzmi.xul	2008-07-23 18:59:14.000000000 +0700
+++ browzmi.0.3.8.mod/chrome/content/browzmi.xul	2008-08-04 21:25:39.720635200 +0700
@@ -16,12 +16,39 @@
     <script type="application/x-javascript" src="chrome://browzmi/content/history.js"/>
     <script type="application/x-javascript" src="chrome://browzmi/content/extension.js"/>
     <script type="application/x-javascript" src="chrome://browzmi/content/toolbar.js"/>
+    <script type="application/x-javascript" src="chrome://browzmi/content/contextmenu.js"/>
     <script type="application/x-javascript" src="chrome://browzmi/content/observer.js"/>
     <script type="application/x-javascript" src="chrome://browzmi/content/watcher.js"/>
 
     <toolbarpalette id="BrowserToolbarPalette">
         <toolbarbutton id="browzmi-toolbar-button" class="toolbarbutton-1"
                        label="&wz.toolbarbutton.label;" tooltiptext="&wz.toolbarbutton.tooltip;"
-                       oncommand="wzExt.toolbar.buttonClick();"/>
+                       oncommand="wzExt.toolbar.buttonClick(event);"
+                       onclick="checkForMiddleClick(this, event);" />
     </toolbarpalette>
-</overlay>
\ No newline at end of file
+
+    <popup id="contentAreaContextMenu">
+      <menuitem id="browzmi-context-link"
+                class="browzmi-context menuitem-iconic"
+                insertbefore="context-sep-open"
+                label="Open this link in Browzmi"
+                oncommand="wzExt.context.itemClick(gContextMenu.linkURL, event);"
+                onclick="checkForMiddleClick(this, event);" />
+
+      <menuitem id="browzmi-context-page"
+                class="browzmi-context menuitem-iconic"
+                insertbefore="context-bookmarkpage"
+                label="Open this page in Browzmi"
+                oncommand="wzExt.context.itemClick(content.document.location.href, event);"
+                onclick="checkForMiddleClick(this, event);" />
+
+      <menuitem id="browzmi-context-frame"
+                class="browzmi-context menuitem-iconic"
+                insertafter="frame"
+                label="Open this frame in Browzmi"
+                oncommand="wzExt.context.itemClick(gContextMenu.target.ownerDocument, event);"
+                onclick="checkForMiddleClick(this, event);" />
+    </popup>
+
+</overlay>
+
diff -urN browzmi.0.3.8/chrome/content/contextmenu.js browzmi.0.3.8.mod/chrome/content/contextmenu.js
--- browzmi.0.3.8/chrome/content/contextmenu.js	1970-01-01 07:00:00.000000000 +0700
+++ browzmi.0.3.8.mod/chrome/content/contextmenu.js	2008-08-04 21:08:14.000000000 +0700
@@ -0,0 +1,31 @@
+with (wzExt) {
+    var initContextMenu = function () {
+        var contextPopup = $('contentAreaContextMenu');
+        contextPopup.addEventListener("popupshowing", wzExt.context.init, false);
+    };
+
+    wzExt.context = {
+        init: function() {
+            var gx = gContextMenu;
+            
+            // browsing in Browzmi
+            var isBrowzmi = util.isBrowzmiUrl(content.location.href);
+
+            // show menuitem if right click on a link and not in Browzmi
+            gx.showItem('browzmi-context-link', gx.onLink && !isBrowzmi);
+            
+            // show menuitem if right click on a page and not in Browzmi
+            gx.showItem('browzmi-context-page',
+                        !(gx.isContentSelected || gx.onTextInput ||
+                          gx.onLink || gx.onImage) && !isBrowzmi);
+            
+            // show menuitem if right click on a frame and not in Browzmi
+            gx.showItem('browzmi-context-frame', gx.inFrame && !isBrowzmi);
+        },
+
+        itemClick: function (aURL, e) {
+            openUILink(util.redirectUrl() + aURL, e, false, true, null, null, null);
+        }
+    };
+}
+
diff -urN browzmi.0.3.8/chrome/content/toolbar.js browzmi.0.3.8.mod/chrome/content/toolbar.js
--- browzmi.0.3.8/chrome/content/toolbar.js	2008-07-23 18:59:14.000000000 +0700
+++ browzmi.0.3.8.mod/chrome/content/toolbar.js	2008-08-04 21:26:46.166179200 +0700
@@ -26,7 +26,7 @@
         buttonClick: function () {
             if (!util.isApplicationUrl($("urlbar").value)) {
                 //noinspection JSUnresolvedVariable,JSUnresolvedFunction
-                gBrowser.webNavigation.loadURI(util.redirectUrl() + $("urlbar").value, null, null, null, null);
+                openUILink(util.redirectUrl() + $("urlbar").value, e, false, true, null, null, null);
             }
         }
     };
diff -urN browzmi.0.3.8/chrome/content/watcher.js browzmi.0.3.8.mod/chrome/content/watcher.js
--- browzmi.0.3.8/chrome/content/watcher.js	2008-07-23 18:59:14.000000000 +0700
+++ browzmi.0.3.8.mod/chrome/content/watcher.js	2008-08-04 13:50:00.000000000 +0700
@@ -124,6 +124,7 @@
                 util.updatePreference('host', "www.browzmi.com");
             }
             installToolbar();
+            initContextMenu();
         }
 
         function handleMultipleTabs() {