diff --git a/mozilla/mailnews/addrbook/src/nsAbLDAPDirectory.cpp b/mozilla/mailnews/addrbook/src/nsAbLDAPDirectory.cpp
index 9060eee303c..ee30abe13b2 100644
--- a/mozilla/mailnews/addrbook/src/nsAbLDAPDirectory.cpp
+++ b/mozilla/mailnews/addrbook/src/nsAbLDAPDirectory.cpp
@@ -464,6 +464,7 @@ nsresult nsAbLDAPDirectory::OnSearchFinished (PRInt32 result)
 
     nsAutoLock lock (mLock);
     mPerformingQuery = PR_FALSE;
+    mListener = nsnull; // break cycle with listener
 
     return NS_OK;
 }
diff --git a/mozilla/mailnews/addrbook/src/nsAbLDAPDirectoryQuery.cpp b/mozilla/mailnews/addrbook/src/nsAbLDAPDirectoryQuery.cpp
index 21e57da1d4b..5b1abd310b9 100644
--- a/mozilla/mailnews/addrbook/src/nsAbLDAPDirectoryQuery.cpp
+++ b/mozilla/mailnews/addrbook/src/nsAbLDAPDirectoryQuery.cpp
@@ -141,12 +141,14 @@ nsAbQueryLDAPMessageListener::nsAbQueryLDAPMessageListener (
     mLock(0)
 
 {
+  NS_ADDREF(mDirectoryQuery);
 }
 
 nsAbQueryLDAPMessageListener::~nsAbQueryLDAPMessageListener ()
 {
     if (mLock)
         PR_DestroyLock (mLock);
+    NS_RELEASE(mDirectoryQuery);
 }
 
 nsresult nsAbQueryLDAPMessageListener::Initiate ()
diff --git a/mozilla/mailnews/addrbook/src/nsAbLDAPDirectoryQuery.h b/mozilla/mailnews/addrbook/src/nsAbLDAPDirectoryQuery.h
index 941d7d724e3..bb2f7315e99 100644
--- a/mozilla/mailnews/addrbook/src/nsAbLDAPDirectoryQuery.h
+++ b/mozilla/mailnews/addrbook/src/nsAbLDAPDirectoryQuery.h
@@ -74,9 +74,9 @@ protected:
     nsXPIDLCString mLogin; // authenticate to the LDAP server as...
     nsCOMPtr<nsILDAPURL> mDirectoryUrl; // the URL for the server
     PRUint32 mProtocolVersion; // version of LDAP (see nsILDAPConnection.idl)
+    nsCOMPtr <nsILDAPMessageListener> mListener;
 
 private:
-    nsCOMPtr <nsILDAPMessageListener> mListener;
     PRBool mInitialized;
 
     PRLock* mLock;