diff --git a/src/org/thoughtcrime/securesms/ConversationItem.java b/src/org/thoughtcrime/securesms/ConversationItem.java
index 4fa13abd8..8cc1560bf 100644
--- a/src/org/thoughtcrime/securesms/ConversationItem.java
+++ b/src/org/thoughtcrime/securesms/ConversationItem.java
@@ -127,7 +127,6 @@ public class ConversationItem extends LinearLayout
   private int measureCalls;
 
   private final PassthroughClickListener        passthroughClickListener   = new PassthroughClickListener();
-  private final AttachmentDownloadClickListener downloadClickListener      = new AttachmentDownloadClickListener();
   private final SharedContactEventListener      sharedContactEventListener = new SharedContactEventListener();
   private final SharedContactClickListener      sharedContactClickListener = new SharedContactClickListener();
 
@@ -401,7 +400,6 @@ public class ConversationItem extends LinearLayout
 
       //noinspection ConstantConditions
       audioViewStub.get().setAudio(new AudioSlide(context, messageRecord), showControls);
-      audioViewStub.get().setDownloadClickListener(downloadClickListener);
       audioViewStub.get().setOnLongClickListener(passthroughClickListener);
 
       ViewUtil.updateLayoutParams(bodyText, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
@@ -417,7 +415,6 @@ public class ConversationItem extends LinearLayout
       //noinspection ConstantConditions
       documentViewStub.get().setDocument(new DocumentSlide(context, messageRecord), showControls);
       documentViewStub.get().setDocumentClickListener(new ThumbnailClickListener());
-      documentViewStub.get().setDownloadClickListener(downloadClickListener);
       documentViewStub.get().setOnLongClickListener(passthroughClickListener);
 
       ViewUtil.updateLayoutParams(bodyText, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
@@ -438,7 +435,6 @@ public class ConversationItem extends LinearLayout
                                                 messageRecord.getWidth(100),
                                                 messageRecord.getHeight(100));
       mediaThumbnailStub.get().setThumbnailClickListener(new ThumbnailClickListener());
-      mediaThumbnailStub.get().setDownloadClickListener(downloadClickListener);
       mediaThumbnailStub.get().setOnLongClickListener(passthroughClickListener);
       mediaThumbnailStub.get().setOnClickListener(passthroughClickListener);
       mediaThumbnailStub.get().showShade(TextUtils.isEmpty(messageRecord.getText()));
@@ -731,27 +727,6 @@ public class ConversationItem extends LinearLayout
     }
   }
 
-  private class AttachmentDownloadClickListener implements SlideClickListener {
-    @Override
-    public void onClick(View v, final Slide slide) {
-//      if (messageRecord.isMmsNotification()) {
-//        ApplicationContext.getInstance(context)
-//                          .getJobManager()
-//                          .add(new MmsDownloadJob(context, messageRecord.getId(),
-//                                                  messageRecord.getThreadId(), false));
-//      } else {
-        DatabaseFactory.getAttachmentDatabase(context).setTransferState(messageRecord.getId(),
-                                                                        slide.asAttachment(),
-                                                                        AttachmentDatabase.TRANSFER_PROGRESS_STARTED);
-
-        ApplicationContext.getInstance(context)
-                          .getJobManager()
-                          .add(new AttachmentDownloadJob(context, messageRecord.getId(),
-                                                         ((DatabaseAttachment)slide.asAttachment()).getAttachmentId(), true));
-//      }
-    }
-  }
-
   private class ThumbnailClickListener implements SlideClickListener {
     public void onClick(final View v, final Slide slide) {
       if (shouldInterceptClicks(messageRecord) || !batchSelected.isEmpty()) {
diff --git a/src/org/thoughtcrime/securesms/components/AudioView.java b/src/org/thoughtcrime/securesms/components/AudioView.java
index 3c1a23d24..84ff205da 100644
--- a/src/org/thoughtcrime/securesms/components/AudioView.java
+++ b/src/org/thoughtcrime/securesms/components/AudioView.java
@@ -108,10 +108,6 @@ public class AudioView extends FrameLayout implements AudioSlidePlayer.Listener
     }
   }
 
-  public void setDownloadClickListener(@Nullable SlideClickListener listener) {
-    this.downloadListener = listener;
-  }
-
   @Override
   public void onStart() {
     if (this.pauseButton.getVisibility() != View.VISIBLE) {
diff --git a/src/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java b/src/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java
index 47d01b46c..1bbfb106d 100644
--- a/src/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java
+++ b/src/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java
@@ -168,10 +168,6 @@ public class ConversationItemThumbnail extends FrameLayout {
     thumbnail.setThumbnailClickListener(listener);
   }
 
-  public void setDownloadClickListener(SlideClickListener listener) {
-    thumbnail.setDownloadClickListener(listener);
-  }
-
   public void clear(GlideRequests glideRequests) {
     thumbnail.clear(glideRequests);
   }
diff --git a/src/org/thoughtcrime/securesms/components/DocumentView.java b/src/org/thoughtcrime/securesms/components/DocumentView.java
index ebd44e6fb..2b4da4da9 100644
--- a/src/org/thoughtcrime/securesms/components/DocumentView.java
+++ b/src/org/thoughtcrime/securesms/components/DocumentView.java
@@ -67,10 +67,6 @@ public class DocumentView extends FrameLayout {
     }
   }
 
-  public void setDownloadClickListener(@Nullable SlideClickListener listener) {
-    this.downloadListener = listener;
-  }
-
   public void setDocumentClickListener(@Nullable SlideClickListener listener) {
     this.viewListener = listener;
   }
diff --git a/src/org/thoughtcrime/securesms/components/ThumbnailView.java b/src/org/thoughtcrime/securesms/components/ThumbnailView.java
index 89b6b2ada..5fe13a0d0 100644
--- a/src/org/thoughtcrime/securesms/components/ThumbnailView.java
+++ b/src/org/thoughtcrime/securesms/components/ThumbnailView.java
@@ -56,7 +56,6 @@ public class ThumbnailView extends FrameLayout {
   private final int[] measureDimens = new int[2];
 
   private SlideClickListener            thumbnailClickListener = null;
-  private SlideClickListener            downloadClickListener  = null;
   private Slide                         slide                  = null;
 
   private int radius;
@@ -284,10 +283,6 @@ public class ThumbnailView extends FrameLayout {
     this.thumbnailClickListener = listener;
   }
 
-  public void setDownloadClickListener(SlideClickListener listener) {
-    this.downloadClickListener = listener;
-  }
-
   public void clear(GlideRequests glideRequests) {
     glideRequests.clear(image);