diff --git a/mailnews/base/resources/content/mailWindowOverlay.js b/mailnews/base/resources/content/mailWindowOverlay.js
index 0e1a2d2b75b9..3f2cb8bceb19 100644
--- a/mailnews/base/resources/content/mailWindowOverlay.js
+++ b/mailnews/base/resources/content/mailWindowOverlay.js
@@ -688,8 +688,8 @@ function MsgUnsubscribe()
 
 function MsgSaveAsFile()
 {
-    if (gDBView.numSelected == 1) {
-        SaveAsFile(gDBView.URIForFirstSelectedMessage);
+    if (GetNumSelectedMessages() == 1) {
+        SaveAsFile(GetFirstSelectedMessage());
     }
 }
 
@@ -697,8 +697,8 @@ function MsgSaveAsFile()
 function MsgSaveAsTemplate()
 {
     var folder = GetLoadedMsgFolder();
-    if (gDBView.numSelected == 1) {
-        SaveAsTemplate(gDBView.URIForFirstSelectedMessage, folder);
+    if (GetNumSelectedMessages() == 1) {
+        SaveAsTemplate(GetFirstSelectedMessage(), folder);
     }
 }