diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/ActionButtonUtils.java b/app/src/main/java/de/danoeh/antennapod/adapter/ActionButtonUtils.java
index 72c8549e0..1a8f0a67a 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/ActionButtonUtils.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/ActionButtonUtils.java
@@ -10,9 +10,7 @@ import org.apache.commons.lang3.Validate;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.feed.FeedMedia;
-import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.storage.DownloadRequester;
-import de.danoeh.antennapod.core.util.LongList;
 
 /**
  * Utility methods for the action button that is displayed on the right hand side
@@ -49,7 +47,7 @@ public class ActionButtonUtils {
      * Sets the displayed bitmap and content description of the given
      * action button so that it matches the state of the FeedItem.
      */
-    public void configureActionButton(ImageButton butSecondary, FeedItem item) {
+    public void configureActionButton(ImageButton butSecondary, FeedItem item, boolean isInQueue) {
         Validate.isTrue(butSecondary != null && item != null, "butSecondary or item was null");
 
         final FeedMedia media = item.getMedia();
@@ -64,9 +62,8 @@ public class ActionButtonUtils {
                     butSecondary.setContentDescription(context.getString(labels[1]));
                 } else {
                     // item is not downloaded and not being downloaded
-                    LongList queueIds = DBReader.getQueueIDList();
                     if(DefaultActionButtonCallback.userAllowedMobileDownloads() ||
-                            !DefaultActionButtonCallback.userChoseAddToQueue() || queueIds.contains(item.getId())) {
+                            !DefaultActionButtonCallback.userChoseAddToQueue() || isInQueue) {
                         butSecondary.setVisibility(View.VISIBLE);
                         butSecondary.setImageDrawable(drawables.getDrawable(2));
                         butSecondary.setContentDescription(context.getString(labels[2]));
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java
index 936f5f57f..bda70ba6a 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesRecycleAdapter.java
@@ -163,13 +163,14 @@ public class AllEpisodesRecycleAdapter extends RecyclerView.Adapter<AllEpisodesR
             holder.txtvDuration.setVisibility(View.GONE);
         }
 
-        if (itemAccess.isInQueue(item)) {
+        boolean isInQueue = itemAccess.isInQueue(item);
+        if (isInQueue) {
             holder.queueStatus.setVisibility(View.VISIBLE);
         } else {
             holder.queueStatus.setVisibility(View.INVISIBLE);
         }
 
-        actionButtonUtils.configureActionButton(holder.butSecondary, item);
+        actionButtonUtils.configureActionButton(holder.butSecondary, item, isInQueue);
         holder.butSecondary.setFocusable(false);
         holder.butSecondary.setTag(item);
         holder.butSecondary.setOnClickListener(secondaryActionListener);
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java
index 507d1adbc..c6c158943 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java
@@ -176,7 +176,8 @@ public class FeedItemlistAdapter extends BaseAdapter {
                 }
             }
 
-            actionButtonUtils.configureActionButton(holder.butAction, item);
+            boolean isInQueue = itemAccess.isInQueue(item);
+            actionButtonUtils.configureActionButton(holder.butAction, item, isInQueue);
             holder.butAction.setFocusable(false);
             holder.butAction.setTag(item);
             holder.butAction.setOnClickListener(butActionListener);
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java
index 8593e0dde..3326cc859 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/QueueRecyclerAdapter.java
@@ -4,14 +4,12 @@ import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.support.annotation.Nullable;
 import android.support.v4.view.MotionEventCompat;
-import android.support.v7.widget.PopupMenu;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.helper.ItemTouchHelper;
 import android.text.format.DateUtils;
 import android.util.Log;
 import android.view.ContextMenu;
 import android.view.LayoutInflater;
-import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.MotionEvent;
@@ -37,7 +35,6 @@ import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.feed.FeedMedia;
 import de.danoeh.antennapod.core.glide.ApGlideSettings;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
-import de.danoeh.antennapod.core.storage.DownloadRequestException;
 import de.danoeh.antennapod.core.storage.DownloadRequester;
 import de.danoeh.antennapod.core.util.Converter;
 import de.danoeh.antennapod.core.util.LongList;
@@ -251,7 +248,7 @@ public class QueueRecyclerAdapter extends RecyclerView.Adapter<QueueRecyclerAdap
                 }
             }
 
-            actionButtonUtils.configureActionButton(butSecondary, item);
+            actionButtonUtils.configureActionButton(butSecondary, item, true);
             butSecondary.setFocusable(false);
             butSecondary.setTag(item);
             butSecondary.setOnClickListener(secondaryActionListener);