diff --git a/chrome/content/overlay-ff.js b/chrome/content/overlay-ff.js
index 0a73fa0..a5b42c8 100644
--- a/chrome/content/overlay-ff.js
+++ b/chrome/content/overlay-ff.js
@@ -49,10 +49,14 @@ if(com.tobwithu.xnotifier.p_getBoolPref("multiSession")){
         var browser = gBrowser.getBrowserForTab(event.target);
         browser.addProgressListener(com.tobwithu.xnotifier.main);
     }, false);
-    for(var i=0;i<gBrowser.tabContainer.childNodes.length;i++){
+    /* The following loop allows mail tabs opened by X-Notifier to still work properly after closing
+       and restoring the browser. However, it prevents the optimization achieved in bug 1345090
+       (https://bugzilla.mozilla.org/show_bug.cgi?id=1345090), so the browser takes much more time
+       to restore tabs. That's why it has been commented out. */
+    /*for(var i=0;i<gBrowser.tabContainer.childNodes.length;i++){
       var browser=gBrowser.getBrowserForTab(gBrowser.tabContainer.childNodes[i]);
       browser.addProgressListener(com.tobwithu.xnotifier.main);
-    }
+    }*/
   }
 }
 
@@ -206,4 +210,4 @@ com.tobwithu.xnotifier.getBMfolder=function(title){
   }
   rootNode.containerOpen = false;
   return bmsvc.createFolder(menuFolder,title, bmsvc.DEFAULT_INDEX);
-}
\ No newline at end of file
+}