diff --git a/src/com/android/email/activity/MessageViewFragmentBase.java b/src/com/android/email/activity/MessageViewFragmentBase.java
index 7bc30c1aa..6d3eade2e 100644
--- a/src/com/android/email/activity/MessageViewFragmentBase.java
+++ b/src/com/android/email/activity/MessageViewFragmentBase.java
@@ -736,7 +736,10 @@ public abstract class MessageViewFragmentBase extends Fragment implements View.O
                 }
                 @Override
                 protected void onPostExecute(Void result) {
-                    if (attachment.cancelButton.getVisibility() != View.VISIBLE) {
+                    // If the load buttons is shown, it's already loaded -- don't show the stop
+                    // button.
+                    if (attachment.cancelButton.getVisibility() != View.VISIBLE
+                            && attachment.loadButton.getVisibility() != View.VISIBLE) {
                         attachment.cancelButton.setVisibility(View.VISIBLE);
                     }
                 }