From 618d274cc3415fe64f395037d9bf1a55c76193f6 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Mon, 12 Oct 2009 08:31:03 -0600
Subject: [PATCH] Fixes re: dhtmlHistory usage.

---
 imp/js/DimpBase.js | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/imp/js/DimpBase.js b/imp/js/DimpBase.js
index 5db5530f9..ac850f986 100644
--- a/imp/js/DimpBase.js
+++ b/imp/js/DimpBase.js
@@ -212,7 +212,7 @@ var DimpBase = {
         if (loc.startsWith('msg:')) {
             separator = loc.indexOf(':', 4);
             f = loc.substring(4, separator);
-            this.uid = loc.substring(separator + 1);
+            this.uid = parseInt(loc.substring(separator + 1), 10);
             loc = 'folder:' + f;
             // Now fall through to the 'folder:' check below.
         }
@@ -281,7 +281,6 @@ var DimpBase = {
 
         case 'options':
             this.highlightSidebar('appoptions');
-            this._addHistory(loc);
             DimpCore.setTitle(DIMP.text.prefs);
             this.iframeContent(loc, DIMP.conf.URI_PREFS_IMP);
             break;
@@ -378,14 +377,12 @@ var DimpBase = {
             this.resetSelected();
             this.quicksearchClear(true);
 
-            if (this.folder == f) {
-                return;
+            if (this.folder != f) {
+                $('folderName').update(DIMP.text.loading);
+                $('msgHeader').update();
+                this.folderswitch = true;
+                this.folder = f;
             }
-
-            $('folderName').update(DIMP.text.loading);
-            $('msgHeader').update();
-            this.folderswitch = true;
-            this.folder = f;
         }
 
         this.viewport.loadView(f, this.uid ? { imapuid: Number(this.uid), view: f } : null, opts.background);
-- 
2.11.0