diff --git a/src/com/android/email/activity/AccountFolderList.java b/src/com/android/email/activity/AccountFolderList.java
index cdd35cebc..dd88207fe 100644
--- a/src/com/android/email/activity/AccountFolderList.java
+++ b/src/com/android/email/activity/AccountFolderList.java
@@ -214,11 +214,9 @@ public class AccountFolderList extends ListActivity implements OnItemClickListen
         Utility.cancelTask(mDeleteAccountTask, false); // Don't interrupt if it's running.
         mDeleteAccountTask = null;
 
-        mListAdapter.changeCursor(null);
-        mListAdapter = null;
-
-        mHandler = null;
-        mControllerCallback = null;
+        if (mListAdapter != null) { 
+            mListAdapter.changeCursor(null);
+        }
     }
 
     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
diff --git a/src/com/android/email/activity/MailboxList.java b/src/com/android/email/activity/MailboxList.java
index f159818ea..aa8f20507 100644
--- a/src/com/android/email/activity/MailboxList.java
+++ b/src/com/android/email/activity/MailboxList.java
@@ -199,9 +199,6 @@ public class MailboxList extends ListActivity implements OnItemClickListener, On
         mMessageCountTask = null;
 
         mListAdapter.changeCursor(null);
-        mListAdapter = null;
-        mHandler = null;
-        mControllerCallback = null;
     }
 
     public void onClick(View v) {
diff --git a/src/com/android/email/activity/MessageCompose.java b/src/com/android/email/activity/MessageCompose.java
index 498732ba6..acad6cdf7 100644
--- a/src/com/android/email/activity/MessageCompose.java
+++ b/src/com/android/email/activity/MessageCompose.java
@@ -396,18 +396,13 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
 
         if (mAddressAdapterTo != null) {
             mAddressAdapterTo.changeCursor(null);
-            mAddressAdapterTo = null;
         }
         if (mAddressAdapterCc != null) {
             mAddressAdapterCc.changeCursor(null);
-            mAddressAdapterCc = null;
         }
         if (mAddressAdapterBcc != null) {
             mAddressAdapterBcc.changeCursor(null);
-            mAddressAdapterBcc = null;
         }
-        mHandler = null;
-        mListener = null;
     }
 
     /**
diff --git a/src/com/android/email/activity/MessageList.java b/src/com/android/email/activity/MessageList.java
index a6ed1542d..4d51dea6c 100644
--- a/src/com/android/email/activity/MessageList.java
+++ b/src/com/android/email/activity/MessageList.java
@@ -328,9 +328,6 @@ public class MessageList extends ListActivity implements OnItemClickListener, On
         mSetFooterTask = null;
 
         mListAdapter.changeCursor(null);
-        mListAdapter = null;
-        mHandler = null;
-        mControllerCallback = null;
     }
 
     @Override
diff --git a/src/com/android/email/activity/MessageView.java b/src/com/android/email/activity/MessageView.java
index fde92b082..aab0ff671 100644
--- a/src/com/android/email/activity/MessageView.java
+++ b/src/com/android/email/activity/MessageView.java
@@ -502,9 +502,6 @@ public class MessageView extends Activity implements OnClickListener {
             mMessageContentView = null;
         }
         // the cursor was closed in onPause()
-
-        mHandler = null;
-        mControllerCallback = null;
     }
 
     private void onDelete() {