diff --git a/src/com/android/email/activity/MessageViewFragment.java b/src/com/android/email/activity/MessageViewFragment.java
index 83f2ef4fc..fbfe735d2 100644
--- a/src/com/android/email/activity/MessageViewFragment.java
+++ b/src/com/android/email/activity/MessageViewFragment.java
@@ -415,7 +415,7 @@ public class MessageViewFragment extends MessageViewFragmentBase
 
     private void onDelete() {
         mCallback.onBeforeMessageDelete();
-        ActivityHelper.deleteMessage(getActivity(), mCurrentMessageId);
+        ActivityHelper.deleteMessage(mContext, mCurrentMessageId);
     }
 
     private void onMarkAsUnread() {
diff --git a/src/com/android/email/activity/MessageViewFragmentBase.java b/src/com/android/email/activity/MessageViewFragmentBase.java
index 9d4c7b98d..95766e415 100644
--- a/src/com/android/email/activity/MessageViewFragmentBase.java
+++ b/src/com/android/email/activity/MessageViewFragmentBase.java
@@ -100,7 +100,7 @@ public abstract class MessageViewFragmentBase extends Fragment implements View.O
     private static final String BUNDLE_KEY_CURRENT_TAB = "MessageViewFragmentBase.currentTab";
     private static final String BUNDLE_KEY_PICTURE_LOADED = "MessageViewFragmentBase.pictureLoaded";
     private static final int PHOTO_LOADER_ID = 1;
-    private Context mContext;
+    protected Context mContext;
 
     // Regex that matches start of img tag. '<(?i)img\s+'.
     private static final Pattern IMG_TAG_START_REGEX = Pattern.compile("<(?i)img\\s+");