diff --git a/mail/base/content/mailWindow.js b/mail/base/content/mailWindow.js
index eee89ad78fb4..6c9a56bf2f0b 100644
--- a/mail/base/content/mailWindow.js
+++ b/mail/base/content/mailWindow.js
@@ -77,9 +77,6 @@ var gAccountCentralLoaded = true;
 var gFakeAccountPageLoaded = false;
 //End progress and Status variables
 
-// for checking if the folder loaded is Draft or Unsent which msg is editable
-var gIsEditableMsgFolder = false;
-
 function OnMailWindowUnload()
 {
   MailOfflineMgr.uninit();
diff --git a/mail/base/content/msgHdrViewOverlay.js b/mail/base/content/msgHdrViewOverlay.js
index 036669dbc5a2..5d1f4c6a6b6a 100644
--- a/mail/base/content/msgHdrViewOverlay.js
+++ b/mail/base/content/msgHdrViewOverlay.js
@@ -334,9 +334,7 @@ var messageHeaderSink = {
       
       ShowMessageHeaderPane();
       UpdateMessageHeaders();
-  
-      if (gIsEditableMsgFolder)
-        ShowEditMessageButton();
+      ShowEditMessageButton();
       
       for (index in gMessageListeners)
         gMessageListeners[index].onEndHeaders();
@@ -1514,9 +1512,19 @@ function ClearAttachmentList()
 
 function ShowEditMessageButton() 
 {
-  var editBox = document.getElementById("editMessageBox");
-  if (editBox)
-    editBox.collapsed = false;
+  // it would be nice if we passed in the msgHdr from the back end
+  var msgHdr;
+  try
+  {
+    msgHdr = gDBView.hdrForFirstSelectedMessage;
+  }
+  catch (ex)
+  {
+    return;
+  }
+
+  if (IsSpecialFolder(msgHdr.folder, MSG_FOLDER_FLAG_DRAFTS, true))
+    document.getElementById("editMessageBox").collapsed = false;
 } 
 
 function ClearEditMessageButton() 
diff --git a/mail/base/content/msgMail3PaneWindow.js b/mail/base/content/msgMail3PaneWindow.js
index cbfe23178dd0..90cfadce4262 100644
--- a/mail/base/content/msgMail3PaneWindow.js
+++ b/mail/base/content/msgMail3PaneWindow.js
@@ -220,8 +220,6 @@ var folderListener = {
                  gDBView.suppressCommandUpdating = false;
                }
 
-               gIsEditableMsgFolder = IsSpecialFolder(msgFolder, MSG_FOLDER_FLAG_DRAFTS, true);
-
                gCurrentLoadingFolderSortType = 0;
                gCurrentLoadingFolderSortOrder = 0;
                gCurrentLoadingFolderViewType = 0;