diff --git a/k9mail/src/main/java/com/fsck/k9/ui/messageview/DownloadImageTask.java b/k9mail/src/main/java/com/fsck/k9/ui/messageview/DownloadImageTask.java
index 3b43c8026..827bf33d3 100644
--- a/k9mail/src/main/java/com/fsck/k9/ui/messageview/DownloadImageTask.java
+++ b/k9mail/src/main/java/com/fsck/k9/ui/messageview/DownloadImageTask.java
@@ -25,6 +25,7 @@ import com.fsck.k9.provider.AttachmentProvider.AttachmentProviderColumns;
 import org.apache.commons.io.IOUtils;
 
 
+@Deprecated
 class DownloadImageTask extends AsyncTask<String, Void, String> {
     private static final String[] ATTACHMENT_PROJECTION = new String[] {
             AttachmentProviderColumns._ID,
diff --git a/k9mail/src/main/java/com/fsck/k9/ui/messageview/MessageContainerView.java b/k9mail/src/main/java/com/fsck/k9/ui/messageview/MessageContainerView.java
index 02dff2e3c..06a79bcb4 100644
--- a/k9mail/src/main/java/com/fsck/k9/ui/messageview/MessageContainerView.java
+++ b/k9mail/src/main/java/com/fsck/k9/ui/messageview/MessageContainerView.java
@@ -220,6 +220,7 @@ public class MessageContainerView extends LinearLayout implements OnClickListene
                                 break;
                             }
                             case MENU_ITEM_IMAGE_SAVE: {
+                                //TODO: Use download manager
                                 new DownloadImageTask(getContext()).execute(url);
                                 break;
                             }