diff --git a/mozilla/mailnews/base/resources/content/mailWindowOverlay.js b/mozilla/mailnews/base/resources/content/mailWindowOverlay.js
index 7fecbeea141..74d98c158d5 100644
--- a/mozilla/mailnews/base/resources/content/mailWindowOverlay.js
+++ b/mozilla/mailnews/base/resources/content/mailWindowOverlay.js
@@ -2299,11 +2299,11 @@ function allowRemoteContentForSender()
   }
 
   var allowRemoteContent = false;
-  if (cardForEmailAddress)
+  if (cardForEmailAddress && addrbook instanceof Components.interfaces.nsIAbDirectory)
   {
     // set the property for remote content
     cardForEmailAddress.allowRemoteContent = true;
-    cardForEmailAddress.editCardToDatabase("");
+    addrbook.modifyCard(cardForEmailAddress);
     allowRemoteContent = true;
   }
   else