diff --git a/xpfe/components/history/src/nsGlobalHistory.cpp b/xpfe/components/history/src/nsGlobalHistory.cpp
index d02f207af024..d83c2db06b62 100644
--- a/xpfe/components/history/src/nsGlobalHistory.cpp
+++ b/xpfe/components/history/src/nsGlobalHistory.cpp
@@ -1803,8 +1803,8 @@ nsGlobalHistory::URLEnumerator::IsResult(nsIMdbRow* aRow)
   if (mSelectColumn) {
     mdb_err err;
 
-    nsIMdbCell* cell;
-    err = mCurrent->GetCell(mEnv, mURLColumn, &cell);
+   nsMdbPtr<nsIMdbCell> cell(mEnv);
+    err = mCurrent->GetCell(mEnv, mURLColumn, getter_Acquires(cell));
     if (err != 0) return PR_FALSE;
 
     mdbYarn yarn;
@@ -1833,8 +1833,8 @@ nsGlobalHistory::URLEnumerator::ConvertToISupports(nsIMdbRow* aRow, nsISupports*
 {
   mdb_err err;
 
-  nsIMdbCell* cell;
-  err = mCurrent->GetCell(mEnv, mURLColumn, &cell);
+   nsMdbPtr<nsIMdbCell> cell(mEnv);
+  err = mCurrent->GetCell(mEnv, mURLColumn, getter_Acquires(cell));
   if (err != 0) return NS_ERROR_FAILURE;
 
   nsresult rv = NS_ERROR_FAILURE;
@@ -1855,9 +1855,6 @@ nsGlobalHistory::URLEnumerator::ConvertToISupports(nsIMdbRow* aRow, nsISupports*
     }
   }
   
-  if (cell)
-    cell->CutStrongRef(mEnv);
-
   return rv;
 }