1 files changed, 9 insertions, 5 deletions
diff --git a/src/com/android/mail/ui/MailActivity.java b/src/com/android/mail/ui/MailActivity.java
index 554576f89..c497cc671 100644
--- a/src/com/android/mail/ui/MailActivity.java
+++ b/src/com/android/mail/ui/MailActivity.java
@@ -17,7 +17,6 @@
 
 package com.android.mail.ui;
 
-import android.annotation.SuppressLint;
 import android.app.Dialog;
 import android.content.ContentResolver;
 import android.content.Context;
@@ -35,7 +34,6 @@ import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.MotionEvent;
-import android.view.Window;
 import android.view.accessibility.AccessibilityManager;
 
 import com.android.bitmap.BitmapCache;
@@ -91,6 +89,8 @@ public class MailActivity extends AbstractMailActivity implements ControllableAc
 
     private BitmapCache mSendersImageCache;
 
+    private CustomViewToolbar mCustomViewToolbar;
+
     /**
      * Create an NFC message (in the NDEF: Nfc Data Exchange Format) to instruct the recepient to
      * send an email to the current account.
@@ -178,9 +178,9 @@ public class MailActivity extends AbstractMailActivity implements ControllableAc
         final Toolbar toolbar = (Toolbar) findViewById(R.id.mail_toolbar);
         if (toolbar instanceof CustomViewToolbar) {
             // Tablets use CustomViewToolbar to override the default search menu item positioning.
-            final CustomViewToolbar customViewToolbar = (CustomViewToolbar) toolbar;
-            customViewToolbar.setController(this, mController, mViewMode);
-            mController.addConversationListLayoutListener(customViewToolbar);
+            mCustomViewToolbar = (CustomViewToolbar) toolbar;
+            mCustomViewToolbar.setController(this, mController, mViewMode);
+            mController.addConversationListLayoutListener(mCustomViewToolbar);
         }
 
         setSupportActionBar(toolbar);
@@ -331,6 +331,10 @@ public class MailActivity extends AbstractMailActivity implements ControllableAc
     protected void onDestroy() {
         super.onDestroy();
         mController.onDestroy();
+
+        if (mCustomViewToolbar != null) {
+            mCustomViewToolbar.onDestroy();
+        }
     }
 
     @Override