diff --git a/src/com/android/email/activity/MessageViewFragmentBase.java b/src/com/android/email/activity/MessageViewFragmentBase.java
index 4ec4f9f2d..89c05b793 100644
--- a/src/com/android/email/activity/MessageViewFragmentBase.java
+++ b/src/com/android/email/activity/MessageViewFragmentBase.java
@@ -760,7 +760,7 @@ public abstract class MessageViewFragmentBase extends Fragment implements View.O
 
         @Override
         protected void onPostExecute(Attachment[] attachments) {
-            if (attachments == null) {
+            if (isCancelled() || attachments == null) {
                 return;
             }
             boolean htmlChanged = false;