Merge branch 'newgui' into develop. closes #407

Conflicts:
	res/layout/feedinfo.xml

44 files changed, 4740 insertions, 1029 deletions

diff --git a/src/de/danoeh/antennapod/activity/AddFeedActivity.java b/src/de/danoeh/antennapod/activity/AddFeedActivity.java
index a77689ddb..54eff51c5 100644
--- a/src/de/danoeh/antennapod/activity/AddFeedActivity.java
+++ b/src/de/danoeh/antennapod/activity/AddFeedActivity.java
@@ -50,7 +50,6 @@ public class AddFeedActivity extends ActionBarActivity {
             etxtFeedurl.setText(getIntent().getDataString());
         }
 
-        butBrowseMiroGuide = (Button) findViewById(R.id.butBrowseMiroguide);
         butBrowserGpoddernet = (Button) findViewById(R.id.butBrowseGpoddernet);
         butOpmlImport = (Button) findViewById(R.id.butOpmlImport);
         butConfirm = (Button) findViewById(R.id.butConfirm);
diff --git a/src/de/danoeh/antennapod/activity/AudioplayerActivity.java b/src/de/danoeh/antennapod/activity/AudioplayerActivity.java
index de989fa46..2ffaae967 100644
--- a/src/de/danoeh/antennapod/activity/AudioplayerActivity.java
+++ b/src/de/danoeh/antennapod/activity/AudioplayerActivity.java
@@ -4,11 +4,15 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.content.res.TypedArray;
+import android.os.AsyncTask;
 import android.os.Bundle;
+import android.support.v4.app.ActionBarDrawerToggle;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v4.app.ListFragment;
+import android.support.v4.widget.DrawerLayout;
 import android.util.Log;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.View.OnLongClickListener;
@@ -18,18 +22,20 @@ import android.widget.ImageView.ScaleType;
 import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.adapter.ChapterListAdapter;
+import de.danoeh.antennapod.adapter.NavListAdapter;
 import de.danoeh.antennapod.asynctask.ImageLoader;
 import de.danoeh.antennapod.dialog.VariableSpeedDialog;
-import de.danoeh.antennapod.feed.Chapter;
-import de.danoeh.antennapod.feed.MediaType;
-import de.danoeh.antennapod.feed.SimpleChapter;
+import de.danoeh.antennapod.feed.*;
 import de.danoeh.antennapod.fragment.CoverFragment;
 import de.danoeh.antennapod.fragment.ItemDescriptionFragment;
 import de.danoeh.antennapod.preferences.UserPreferences;
 import de.danoeh.antennapod.service.playback.PlaybackService;
+import de.danoeh.antennapod.storage.DBReader;
 import de.danoeh.antennapod.util.playback.ExternalMedia;
 import de.danoeh.antennapod.util.playback.Playable;
 
+import java.util.List;
+
 /**
  * Activity for playing audio files.
  */
@@ -44,6 +50,11 @@ public class AudioplayerActivity extends MediaplayerActivity {
     private static final String PREF_KEY_SELECTED_FRAGMENT_POSITION = "selectedFragmentPosition";
     private static final String PREF_PLAYABLE_ID = "playableId";
 
+    private DrawerLayout drawerLayout;
+    private NavListAdapter navAdapter;
+    private ListView navList;
+    private ActionBarDrawerToggle drawerToggle;
+
     private Fragment[] detachedFragments;
 
     private CoverFragment coverFragment;
@@ -58,7 +69,6 @@ public class AudioplayerActivity extends MediaplayerActivity {
     private int savedPosition = -1;
 
     private TextView txtvTitle;
-    private TextView txtvFeed;
     private Button butPlaybackSpeed;
     private ImageButton butNavLeft;
     private ImageButton butNavRight;
@@ -108,6 +118,8 @@ public class AudioplayerActivity extends MediaplayerActivity {
         super.onStop();
         if (BuildConfig.DEBUG)
             Log.d(TAG, "onStop");
+        cancelLoadTask();
+        EventDistributor.getInstance().unregister(contentUpdate);
 
     }
 
@@ -142,6 +154,7 @@ public class AudioplayerActivity extends MediaplayerActivity {
     @Override
     public void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
+        drawerToggle.onConfigurationChanged(newConfig);
     }
 
     @Override
@@ -149,6 +162,7 @@ public class AudioplayerActivity extends MediaplayerActivity {
         // super.onSaveInstanceState(outState); would cause crash
         if (BuildConfig.DEBUG)
             Log.d(TAG, "onSaveInstanceState");
+
     }
 
     @Override
@@ -193,7 +207,8 @@ public class AudioplayerActivity extends MediaplayerActivity {
             if (BuildConfig.DEBUG)
                 Log.d(TAG,
                         "Couldn't restore from preferences: savedPosition was -1 or saved identifier and playable identifier didn't match.\nsavedPosition: "
-                                + savedPosition + ", id: " + playableId);
+                                + savedPosition + ", id: " + playableId
+                );
 
         }
         return false;
@@ -223,6 +238,8 @@ public class AudioplayerActivity extends MediaplayerActivity {
             switchToFragment(savedPosition);
         }
 
+        EventDistributor.getInstance().register(contentUpdate);
+        loadData();
     }
 
     @Override
@@ -233,7 +250,8 @@ public class AudioplayerActivity extends MediaplayerActivity {
 
     @Override
     protected void onAwaitingVideoSurface() {
-        if (BuildConfig.DEBUG) Log.d(TAG, "onAwaitingVideoSurface was called in audio player -> switching to video player");
+        if (BuildConfig.DEBUG)
+            Log.d(TAG, "onAwaitingVideoSurface was called in audio player -> switching to video player");
         startActivity(new Intent(this, VideoplayerActivity.class));
     }
 
@@ -297,7 +315,8 @@ public class AudioplayerActivity extends MediaplayerActivity {
                             };
                             chapterFragment.setListAdapter(new ChapterListAdapter(
                                     AudioplayerActivity.this, 0, media
-                                    .getChapters(), media));
+                                    .getChapters(), media
+                            ));
                         }
                         currentlyShownFragment = chapterFragment;
                         break;
@@ -323,8 +342,8 @@ public class AudioplayerActivity extends MediaplayerActivity {
 
     private void updateNavButtonDrawable() {
 
-        final int[] buttonTexts = new int[] {R.string.show_shownotes_label,
-        R.string.show_chapters_label, R.string.show_cover_label};
+        final int[] buttonTexts = new int[]{R.string.show_shownotes_label,
+                R.string.show_chapters_label, R.string.show_cover_label};
 
         final TypedArray drawables = obtainStyledAttributes(new int[]{
                 R.attr.navigation_shownotes, R.attr.navigation_chapters});
@@ -382,12 +401,53 @@ public class AudioplayerActivity extends MediaplayerActivity {
     protected void setupGUI() {
         super.setupGUI();
         resetFragmentView();
+        drawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
+        navList = (ListView) findViewById(R.id.nav_list);
         txtvTitle = (TextView) findViewById(R.id.txtvTitle);
-        txtvFeed = (TextView) findViewById(R.id.txtvFeed);
         butNavLeft = (ImageButton) findViewById(R.id.butNavLeft);
         butNavRight = (ImageButton) findViewById(R.id.butNavRight);
         butPlaybackSpeed = (Button) findViewById(R.id.butPlaybackSpeed);
 
+        TypedArray typedArray = obtainStyledAttributes(new int[]{R.attr.nav_drawer_toggle});
+        drawerToggle = new ActionBarDrawerToggle(this, drawerLayout, typedArray.getResourceId(0, 0), R.string.drawer_open, R.string.drawer_close) {
+            String currentTitle = getSupportActionBar().getTitle().toString();
+
+            @Override
+            public void onDrawerOpened(View drawerView) {
+                super.onDrawerOpened(drawerView);
+                currentTitle = getSupportActionBar().getTitle().toString();
+                getSupportActionBar().setTitle(R.string.app_name);
+                supportInvalidateOptionsMenu();
+            }
+
+            @Override
+            public void onDrawerClosed(View drawerView) {
+                super.onDrawerClosed(drawerView);
+                getSupportActionBar().setTitle(currentTitle);
+                supportInvalidateOptionsMenu();
+            }
+        };
+        typedArray.recycle();
+        drawerToggle.setDrawerIndicatorEnabled(false);
+
+        navAdapter = new NavListAdapter(itemAccess, this);
+        navList.setAdapter(navAdapter);
+        navList.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                int viewType = parent.getAdapter().getItemViewType(position);
+                if (viewType != NavListAdapter.VIEW_TYPE_SECTION_DIVIDER) {
+                    int relPos = (viewType == NavListAdapter.VIEW_TYPE_NAV) ? position : position - NavListAdapter.SUBSCRIPTION_OFFSET;
+                    Intent intent = new Intent(AudioplayerActivity.this, MainActivity.class);
+                    intent.putExtra(MainActivity.EXTRA_NAV_TYPE, viewType);
+                    intent.putExtra(MainActivity.EXTRA_NAV_INDEX, relPos);
+                    startActivity(intent);
+                }
+                drawerLayout.closeDrawer(navList);
+            }
+        });
+        drawerToggle.syncState();
+
         butNavLeft.setOnClickListener(new OnClickListener() {
 
             @Override
@@ -466,11 +526,7 @@ public class AudioplayerActivity extends MediaplayerActivity {
     }
 
     private void updateButPlaybackSpeed() {
-        if (controller == null
-                || (controller.getCurrentPlaybackSpeedMultiplier() == -1)) {
-            butPlaybackSpeed.setVisibility(View.GONE);
-        } else {
-            butPlaybackSpeed.setVisibility(View.VISIBLE);
+        if (controller != null && controller.canSetPlaybackSpeed()) {
             butPlaybackSpeed.setText(UserPreferences.getPlaybackSpeed());
         }
     }
@@ -491,11 +547,10 @@ public class AudioplayerActivity extends MediaplayerActivity {
             return false;
         }
         txtvTitle.setText(media.getEpisodeTitle());
-        txtvFeed.setText(media.getFeedTitle());
         if (media.getChapters() != null) {
             butNavRight.setVisibility(View.VISIBLE);
         } else {
-            butNavRight.setVisibility(View.GONE);
+            butNavRight.setVisibility(View.INVISIBLE);
         }
 
 
@@ -508,6 +563,14 @@ public class AudioplayerActivity extends MediaplayerActivity {
             ((AudioplayerContentFragment) currentlyShownFragment)
                     .onDataSetChanged(media);
         }
+
+        if (controller == null
+                || !controller.canSetPlaybackSpeed()) {
+            butPlaybackSpeed.setVisibility(View.GONE);
+        } else {
+            butPlaybackSpeed.setVisibility(View.VISIBLE);
+        }
+
         updateButPlaybackSpeed();
         return true;
     }
@@ -551,4 +614,78 @@ public class AudioplayerActivity extends MediaplayerActivity {
         return R.layout.audioplayer_activity;
     }
 
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (drawerToggle.onOptionsItemSelected(item)) {
+            return true;
+        } else {
+            return super.onOptionsItemSelected(item);
+        }
+    }
+
+    private List<Feed> feeds;
+    private AsyncTask<Void, Void, List<Feed>> loadTask;
+
+    private void loadData() {
+        loadTask = new AsyncTask<Void, Void, List<Feed>>() {
+            @Override
+            protected List<Feed> doInBackground(Void... params) {
+                return DBReader.getFeedList(AudioplayerActivity.this);
+            }
+
+            @Override
+            protected void onPostExecute(List<Feed> result) {
+                super.onPostExecute(result);
+                feeds = result;
+                if (navAdapter != null) {
+                    navAdapter.notifyDataSetChanged();
+                }
+            }
+        };
+        loadTask.execute();
+    }
+
+    private void cancelLoadTask() {
+        if (loadTask != null) {
+            loadTask.cancel(true);
+        }
+    }
+
+    private EventDistributor.EventListener contentUpdate = new EventDistributor.EventListener() {
+
+        @Override
+        public void update(EventDistributor eventDistributor, Integer arg) {
+            if ((EventDistributor.FEED_LIST_UPDATE & arg) != 0) {
+                if (BuildConfig.DEBUG)
+                    Log.d(TAG, "Received contentUpdate Intent.");
+                loadData();
+            }
+        }
+    };
+
+    private final NavListAdapter.ItemAccess itemAccess = new NavListAdapter.ItemAccess() {
+        @Override
+        public int getCount() {
+            if (feeds != null) {
+                return feeds.size();
+            } else {
+                return 0;
+            }
+        }
+
+        @Override
+        public Feed getItem(int position) {
+            if (feeds != null && position < feeds.size()) {
+                return feeds.get(position);
+            } else {
+                return null;
+            }
+        }
+
+        @Override
+        public int getSelectedItemIndex() {
+            return -1;
+        }
+    };
 }
diff --git a/src/de/danoeh/antennapod/activity/DownloadActivity.java b/src/de/danoeh/antennapod/activity/DownloadActivity.java
index 996929cdb..416de73a4 100644
--- a/src/de/danoeh/antennapod/activity/DownloadActivity.java
+++ b/src/de/danoeh/antennapod/activity/DownloadActivity.java
@@ -180,8 +180,8 @@ public class DownloadActivity extends ActionBarActivity implements
 
         @Override
         public void onDownloadDataAvailable(List<Downloader> downloaderList) {
-            dla = new DownloadlistAdapter(DownloadActivity.this, 0,
-                    downloaderList);
+            //dla = new DownloadlistAdapter(DownloadActivity.this, 0,
+             //       downloaderList);
             listview.setAdapter(dla);
             dla.notifyDataSetChanged();
         }
diff --git a/src/de/danoeh/antennapod/activity/FeedItemlistActivity.java b/src/de/danoeh/antennapod/activity/FeedItemlistActivity.java
index d0305eada..95ccb859f 100644
--- a/src/de/danoeh/antennapod/activity/FeedItemlistActivity.java
+++ b/src/de/danoeh/antennapod/activity/FeedItemlistActivity.java
@@ -166,7 +166,7 @@ public class FeedItemlistActivity extends ActionBarActivity {
     public boolean onOptionsItemSelected(MenuItem item) {
         try {
             if (FeedMenuHandler.onOptionsItemClicked(this, item, feed)) {
-                filf.getListAdapter().notifyDataSetChanged();
+             //   filf.getListAdapter().notifyDataSetChanged();
             } else {
                 switch (item.getItemId()) {
                     case R.id.remove_item:
diff --git a/src/de/danoeh/antennapod/activity/MainActivity.java b/src/de/danoeh/antennapod/activity/MainActivity.java
index 1a49e63d0..d9a9cc40b 100644
--- a/src/de/danoeh/antennapod/activity/MainActivity.java
+++ b/src/de/danoeh/antennapod/activity/MainActivity.java
@@ -1,164 +1,317 @@
 package de.danoeh.antennapod.activity;
 
-import android.app.SearchManager;
-import android.app.SearchableInfo;
-import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.content.res.TypedArray;
 import android.media.AudioManager;
+import android.os.AsyncTask;
 import android.os.Bundle;
+import android.os.Handler;
+import android.support.v4.app.ActionBarDrawerToggle;
 import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentPagerAdapter;
+import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
-import android.support.v4.view.MenuItemCompat;
-import android.support.v4.view.ViewPager;
+import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.ActionBarActivity;
-import android.support.v7.widget.SearchView;
 import android.util.Log;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.Window;
+import android.view.*;
+import android.widget.AdapterView;
+import android.widget.ListView;
 import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.adapter.NavListAdapter;
 import de.danoeh.antennapod.feed.EventDistributor;
-import de.danoeh.antennapod.fragment.EpisodesFragment;
-import de.danoeh.antennapod.fragment.ExternalPlayerFragment;
-import de.danoeh.antennapod.fragment.FeedlistFragment;
+import de.danoeh.antennapod.feed.Feed;
+import de.danoeh.antennapod.fragment.*;
 import de.danoeh.antennapod.preferences.UserPreferences;
-import de.danoeh.antennapod.service.download.DownloadService;
-import de.danoeh.antennapod.service.playback.PlaybackService;
 import de.danoeh.antennapod.storage.DBReader;
-import de.danoeh.antennapod.storage.DBTasks;
-import de.danoeh.antennapod.storage.DownloadRequester;
 import de.danoeh.antennapod.util.StorageUtils;
+import org.apache.commons.lang3.StringUtils;
 
-import java.util.ArrayList;
+import java.util.List;
 
 /**
  * The activity that is shown when the user launches the app.
  */
 public class MainActivity extends ActionBarActivity {
     private static final String TAG = "MainActivity";
-
     private static final int EVENTS = EventDistributor.DOWNLOAD_HANDLED
-            | EventDistributor.DOWNLOAD_QUEUED;
+            | EventDistributor.DOWNLOAD_QUEUED
+            | EventDistributor.FEED_LIST_UPDATE
+            | EventDistributor.UNREAD_ITEMS_UPDATE;
+
+    private static final String PREF_NAME = "MainActivityPrefs";
+    private static final String PREF_IS_FIRST_LAUNCH = "prefMainActivityIsFirstLaunch";
+
+    public static final String EXTRA_NAV_INDEX = "nav_index";
+    public static final String EXTRA_NAV_TYPE = "nav_type";
+    public static final String EXTRA_FRAGMENT_ARGS = "fragment_args";
+
+    public static final int POS_NEW = 0,
+            POS_QUEUE = 1,
+            POS_DOWNLOADS = 2,
+            POS_HISTORY = 3,
+            POS_ADD = 4;
 
-    private ViewPager viewpager;
-    private TabsAdapter pagerAdapter;
     private ExternalPlayerFragment externalPlayerFragment;
+    private DrawerLayout drawerLayout;
+
+    private ListView navList;
+    private NavListAdapter navAdapter;
+
+    private ActionBarDrawerToggle drawerToogle;
+
+    private CharSequence drawerTitle;
+    private CharSequence currentTitle;
 
-    private static boolean appLaunched = false;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         setTheme(UserPreferences.getTheme());
         super.onCreate(savedInstanceState);
-        StorageUtils.checkStorageAvailability(this);
         requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
+        StorageUtils.checkStorageAvailability(this);
         setContentView(R.layout.main);
         setVolumeControlStream(AudioManager.STREAM_MUSIC);
 
-        getSupportActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
+        drawerTitle = currentTitle = getTitle();
+
+        drawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
+        navList = (ListView) findViewById(R.id.nav_list);
+
+        TypedArray typedArray = obtainStyledAttributes(new int[]{R.attr.nav_drawer_toggle});
+        drawerToogle = new ActionBarDrawerToggle(this, drawerLayout, typedArray.getResourceId(0, 0), R.string.drawer_open, R.string.drawer_close) {
+            @Override
+            public void onDrawerOpened(View drawerView) {
+                super.onDrawerOpened(drawerView);
+                currentTitle = getSupportActionBar().getTitle();
+                getSupportActionBar().setTitle(drawerTitle);
+                supportInvalidateOptionsMenu();
+            }
+
+            @Override
+            public void onDrawerClosed(View drawerView) {
+                super.onDrawerClosed(drawerView);
+                getSupportActionBar().setTitle(currentTitle);
+                supportInvalidateOptionsMenu();
 
-        viewpager = (ViewPager) findViewById(R.id.viewpager);
-        pagerAdapter = new TabsAdapter(this, viewpager);
+            }
+        };
+        typedArray.recycle();
 
-        viewpager.setAdapter(pagerAdapter);
+        drawerLayout.setDrawerListener(drawerToogle);
+        FragmentManager fm = getSupportFragmentManager();
 
-        ActionBar.Tab feedsTab = getSupportActionBar().newTab();
-        feedsTab.setText(R.string.podcasts_label);
-        ActionBar.Tab episodesTab = getSupportActionBar().newTab();
-        episodesTab.setText(R.string.episodes_label);
+        FragmentTransaction transaction = fm.beginTransaction();
 
-        pagerAdapter.addTab(feedsTab, FeedlistFragment.class, null);
-        pagerAdapter.addTab(episodesTab, EpisodesFragment.class, null);
+        Fragment mainFragment = fm.findFragmentByTag("main");
+        if (mainFragment != null) {
+            transaction.replace(R.id.main_view, mainFragment);
+        } else {
+            loadFragment(NavListAdapter.VIEW_TYPE_NAV, POS_NEW, null);
+        }
 
-        FragmentTransaction transaction = getSupportFragmentManager()
-                .beginTransaction();
         externalPlayerFragment = new ExternalPlayerFragment();
         transaction.replace(R.id.playerFragment, externalPlayerFragment);
         transaction.commit();
 
-        // executed on application start
-        if (!appLaunched && getIntent().getAction() != null
-                && getIntent().getAction().equals(Intent.ACTION_MAIN)) {
-            appLaunched = true;
-            if (DBReader.getNumberOfUnreadItems(this) > 0) {
-                // select 'episodes' tab
-                getSupportActionBar().setSelectedNavigationItem(1);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        getSupportActionBar().setHomeButtonEnabled(true);
+
+        navAdapter = new NavListAdapter(itemAccess, this);
+        navList.setAdapter(navAdapter);
+        navList.setOnItemClickListener(navListClickListener);
+
+        checkFirstLaunch();
+    }
+
+    private void checkFirstLaunch() {
+        SharedPreferences prefs = getSharedPreferences(PREF_NAME, MODE_PRIVATE);
+        if (prefs.getBoolean(PREF_IS_FIRST_LAUNCH, true)) {
+            new Handler().postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    drawerLayout.openDrawer(navList);
+                }
+            }, 1500);
+
+            SharedPreferences.Editor edit = prefs.edit();
+            edit.putBoolean(PREF_IS_FIRST_LAUNCH, false);
+            edit.commit();
+        }
+    }
+
+    public ActionBar getMainActivtyActionBar() {
+        return getSupportActionBar();
+    }
+
+    public List<Feed> getFeeds() {
+        return feeds;
+    }
+
+    private void loadFragment(int viewType, int relPos, Bundle args) {
+        FragmentManager fragmentManager = getSupportFragmentManager();
+        // clear back stack
+        for (int i = 0; i < fragmentManager.getBackStackEntryCount(); i++) {
+            fragmentManager.popBackStack();
+        }
+
+        FragmentTransaction fT = fragmentManager.beginTransaction();
+        Fragment fragment = null;
+        if (viewType == NavListAdapter.VIEW_TYPE_NAV) {
+            switch (relPos) {
+                case POS_NEW:
+                    fragment = new NewEpisodesFragment();
+                    break;
+                case POS_QUEUE:
+                    fragment = new QueueFragment();
+                    break;
+                case POS_DOWNLOADS:
+                    fragment = new DownloadsFragment();
+                    break;
+                case POS_HISTORY:
+                    fragment = new PlaybackHistoryFragment();
+                    break;
+                case POS_ADD:
+                    fragment = new AddFeedFragment();
+                    break;
+
+            }
+            currentTitle = getString(NavListAdapter.NAV_TITLES[relPos]);
+            selectedNavListIndex = relPos;
+
+        } else if (viewType == NavListAdapter.VIEW_TYPE_SUBSCRIPTION) {
+            Feed feed = itemAccess.getItem(relPos);
+            currentTitle = "";
+            fragment = ItemlistFragment.newInstance(feed.getId());
+            selectedNavListIndex = NavListAdapter.SUBSCRIPTION_OFFSET + relPos;
+
+        }
+        if (fragment != null) {
+            if (args != null) {
+                fragment.setArguments(args);
+            }
+            fT.replace(R.id.main_view, fragment, "main");
+            fragmentManager.popBackStack();
+        }
+        fT.commit();
+        getSupportActionBar().setTitle(currentTitle);
+        if (navAdapter != null) {
+            navAdapter.notifyDataSetChanged();
+        }
+    }
+
+    public void loadNavFragment(int position, Bundle args) {
+        loadFragment(NavListAdapter.VIEW_TYPE_NAV, position, args);
+    }
+
+    public void loadFeedFragment(long feedID) {
+        if (feeds != null) {
+            for (int i = 0; i < feeds.size(); i++) {
+                if (feeds.get(i).getId() == feedID) {
+                    loadFragment(NavListAdapter.VIEW_TYPE_SUBSCRIPTION, i, null);
+                    break;
+                }
             }
         }
+    }
+
+    public void loadChildFragment(Fragment fragment) {
+        if (fragment == null) throw new IllegalArgumentException("fragment = null");
+        FragmentManager fm = getSupportFragmentManager();
+        fm.beginTransaction()
+                .replace(R.id.main_view, fragment, "main")
+                .addToBackStack(null)
+                .commit();
+    }
+
+    private AdapterView.OnItemClickListener navListClickListener = new AdapterView.OnItemClickListener() {
+        @Override
+        public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+            int viewType = parent.getAdapter().getItemViewType(position);
+            if (viewType != NavListAdapter.VIEW_TYPE_SECTION_DIVIDER && position != selectedNavListIndex) {
+                int relPos = (viewType == NavListAdapter.VIEW_TYPE_NAV) ? position : position - NavListAdapter.SUBSCRIPTION_OFFSET;
+                loadFragment(viewType, relPos, null);
+                selectedNavListIndex = position;
+                navAdapter.notifyDataSetChanged();
+            }
+            drawerLayout.closeDrawer(navList);
+        }
+    };
+
+    @Override
+    protected void onPostCreate(Bundle savedInstanceState) {
+        super.onPostCreate(savedInstanceState);
+        drawerToogle.syncState();
         if (savedInstanceState != null) {
-            getSupportActionBar().setSelectedNavigationItem(
-                    savedInstanceState.getInt("tab", 0));
+            currentTitle = savedInstanceState.getString("title");
+            if (!drawerLayout.isDrawerOpen(navList)) {
+                getSupportActionBar().setTitle(currentTitle);
+            }
+            selectedNavListIndex = savedInstanceState.getInt("selectedNavIndex");
         }
     }
 
     @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        drawerToogle.onConfigurationChanged(newConfig);
+    }
+
+    @Override
     protected void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
-        outState.putInt("tab", getSupportActionBar()
-                .getSelectedNavigationIndex());
+        outState.putString("title", getSupportActionBar().getTitle().toString());
+        outState.putInt("selectedNavIndex", selectedNavListIndex);
+
     }
 
     @Override
     protected void onPause() {
         super.onPause();
-        EventDistributor.getInstance().unregister(contentUpdate);
     }
 
     @Override
     protected void onResume() {
         super.onResume();
         StorageUtils.checkStorageAvailability(this);
-        updateProgressBarVisibility();
         EventDistributor.getInstance().register(contentUpdate);
-    }
-
-    private EventDistributor.EventListener contentUpdate = new EventDistributor.EventListener() {
 
-        @Override
-        public void update(EventDistributor eventDistributor, Integer arg) {
-            if ((EVENTS & arg) != 0) {
-                if (BuildConfig.DEBUG)
-                    Log.d(TAG, "Received contentUpdate Intent.");
-                updateProgressBarVisibility();
+        Intent intent = getIntent();
+        if (StringUtils.equals(intent.getAction(), Intent.ACTION_SEND)) {
+            String extra = intent.getStringExtra(Intent.EXTRA_TEXT);
+            if (extra != null) {
+                Bundle args = new Bundle();
+                args.putString(AddFeedFragment.ARG_FEED_URL, extra);
+                loadFragment(NavListAdapter.VIEW_TYPE_NAV, POS_ADD, args);
+                selectedNavListIndex = POS_ADD;
+                navAdapter.notifyDataSetChanged();
             }
+        } else if (feeds != null && intent.hasExtra(EXTRA_NAV_INDEX) && intent.hasExtra(EXTRA_NAV_TYPE)) {
+            handleNavIntent();
         }
-    };
 
-    private void updateProgressBarVisibility() {
-        if (DownloadService.isRunning
-                && DownloadRequester.getInstance().isDownloadingFeeds()) {
-            setSupportProgressBarIndeterminateVisibility(true);
-        } else {
-            setSupportProgressBarIndeterminateVisibility(false);
-        }
-        supportInvalidateOptionsMenu();
+        loadData();
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+        cancelLoadTask();
+        EventDistributor.getInstance().unregister(contentUpdate);
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
+        if (drawerToogle.onOptionsItemSelected(item)) {
+            return true;
+        }
         switch (item.getItemId()) {
-            case R.id.add_feed:
-                startActivity(new Intent(this, AddFeedActivity.class));
-                return true;
-            case R.id.all_feed_refresh:
-                DBTasks.refreshAllFeeds(this, null);
-                return true;
-            case R.id.show_downloads:
-                startActivity(new Intent(this, DownloadActivity.class));
-                return true;
             case R.id.show_preferences:
                 startActivity(new Intent(this, PreferenceActivity.class));
                 return true;
-            case R.id.show_player:
-                startActivity(PlaybackService.getPlayerActivityIntent(this));
-                return true;
-            case R.id.show_playback_history:
-                startActivity(new Intent(this, PlaybackHistoryActivity.class));
-                return true;
             default:
                 return super.onOptionsItemSelected(item);
         }
@@ -167,13 +320,7 @@ public class MainActivity extends ActionBarActivity {
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
         super.onPrepareOptionsMenu(menu);
-        MenuItem refreshAll = menu.findItem(R.id.all_feed_refresh);
-        if (DownloadService.isRunning
-                && DownloadRequester.getInstance().isDownloadingFeeds()) {
-            refreshAll.setVisible(false);
-        } else {
-            refreshAll.setVisible(true);
-        }
+
         return true;
     }
 
@@ -182,104 +329,96 @@ public class MainActivity extends ActionBarActivity {
         super.onCreateOptionsMenu(menu);
         MenuInflater inflater = getMenuInflater();
         inflater.inflate(R.menu.main, menu);
-
-        SearchManager searchManager =
-                (SearchManager) getSystemService(Context.SEARCH_SERVICE);
-        MenuItem searchItem = menu.findItem(R.id.search_item);
-        SearchView searchView = (SearchView) MenuItemCompat.getActionView(searchItem);
-        if (searchView == null) {
-            MenuItemCompat.setActionView(searchItem, new SearchView(this));
-            searchView = (SearchView) MenuItemCompat.getActionView(searchItem);
-        }
-        searchView.setIconifiedByDefault(true);
-
-        SearchableInfo info = searchManager.getSearchableInfo(getComponentName());
-        searchView.setSearchableInfo(
-                searchManager.getSearchableInfo(getComponentName()));
-
-
         return true;
     }
 
-    public static class TabsAdapter extends FragmentPagerAdapter implements
-            ActionBar.TabListener, ViewPager.OnPageChangeListener {
-        private final Context mContext;
-        private final ActionBar mActionBar;
-        private final ViewPager mViewPager;
-        private final ArrayList<TabInfo> mTabs = new ArrayList<TabInfo>();
-
-        static final class TabInfo {
-            private final Class<?> clss;
-            private final Bundle args;
-
-            TabInfo(Class<?> _class, Bundle _args) {
-                clss = _class;
-                args = _args;
-            }
-        }
-
-        public TabsAdapter(MainActivity activity, ViewPager pager) {
-            super(activity.getSupportFragmentManager());
-            mContext = activity;
-            mActionBar = activity.getSupportActionBar();
-            mViewPager = pager;
-            mViewPager.setAdapter(this);
-            mViewPager.setOnPageChangeListener(this);
-        }
-
-        public void addTab(ActionBar.Tab tab, Class<?> clss, Bundle args) {
-            TabInfo info = new TabInfo(clss, args);
-            tab.setTag(info);
-            tab.setTabListener(this);
-            mTabs.add(info);
-            mActionBar.addTab(tab);
-            notifyDataSetChanged();
-        }
+    private List<Feed> feeds;
+    private AsyncTask<Void, Void, List<Feed>> loadTask;
+    private int selectedNavListIndex = 0;
 
+    private NavListAdapter.ItemAccess itemAccess = new NavListAdapter.ItemAccess() {
         @Override
         public int getCount() {
-            return mTabs.size();
+            if (feeds != null) {
+                return feeds.size();
+            } else {
+                return 0;
+            }
         }
 
         @Override
-        public Fragment getItem(int position) {
-            TabInfo info = mTabs.get(position);
-            return Fragment.instantiate(mContext, info.clss.getName(),
-                    info.args);
+        public Feed getItem(int position) {
+            if (feeds != null && position < feeds.size()) {
+                return feeds.get(position);
+            } else {
+                return null;
+            }
         }
 
         @Override
-        public void onPageScrolled(int position, float positionOffset,
-                                   int positionOffsetPixels) {
+        public int getSelectedItemIndex() {
+            return selectedNavListIndex;
         }
 
-        @Override
-        public void onPageSelected(int position) {
-            mActionBar.setSelectedNavigationItem(position);
-        }
 
-        @Override
-        public void onPageScrollStateChanged(int state) {
-        }
+    };
 
-        @Override
-        public void onTabSelected(ActionBar.Tab tab, FragmentTransaction ft) {
-            Object tag = tab.getTag();
-            for (int i = 0; i < mTabs.size(); i++) {
-                if (mTabs.get(i) == tag) {
-                    mViewPager.setCurrentItem(i);
+    private void loadData() {
+        cancelLoadTask();
+        loadTask = new AsyncTask<Void, Void, List<Feed>>() {
+            @Override
+            protected List<Feed> doInBackground(Void... params) {
+                return DBReader.getFeedList(MainActivity.this);
+            }
+
+            @Override
+            protected void onPostExecute(List<Feed> result) {
+                super.onPostExecute(result);
+                boolean handleIntent = (feeds == null);
+
+                feeds = result;
+                navAdapter.notifyDataSetChanged();
+
+                if (handleIntent) {
+                    handleNavIntent();
                 }
             }
+        };
+        loadTask.execute();
+    }
+
+    private void cancelLoadTask() {
+        if (loadTask != null) {
+            loadTask.cancel(true);
         }
+    }
 
-        @Override
-        public void onTabUnselected(ActionBar.Tab tab, FragmentTransaction ft) {
+    private EventDistributor.EventListener contentUpdate = new EventDistributor.EventListener() {
 
+        @Override
+        public void update(EventDistributor eventDistributor, Integer arg) {
+            if ((EVENTS & arg) != 0) {
+                if (BuildConfig.DEBUG)
+                    Log.d(TAG, "Received contentUpdate Intent.");
+                loadData();
+            }
         }
+    };
 
-        @Override
-        public void onTabReselected(ActionBar.Tab tab, FragmentTransaction ft) {
+    private void handleNavIntent() {
+        Intent intent = getIntent();
+        if (intent.hasExtra(EXTRA_NAV_INDEX) && intent.hasExtra(EXTRA_NAV_TYPE)) {
+            int index = intent.getIntExtra(EXTRA_NAV_INDEX, 0);
+            int type = intent.getIntExtra(EXTRA_NAV_TYPE, NavListAdapter.VIEW_TYPE_NAV);
+            Bundle args = intent.getBundleExtra(EXTRA_FRAGMENT_ARGS);
+            loadFragment(type, index, args);
         }
+        setIntent(new Intent(MainActivity.this, MainActivity.class)); // to avoid handling the intent twice when the configuration changes
     }
 
+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        setIntent(intent);
+    }
 }
diff --git a/src/de/danoeh/antennapod/activity/SearchActivity.java b/src/de/danoeh/antennapod/activity/SearchActivity.java
index f330aeb7d..02c0838b3 100644
--- a/src/de/danoeh/antennapod/activity/SearchActivity.java
+++ b/src/de/danoeh/antennapod/activity/SearchActivity.java
@@ -58,7 +58,7 @@ public class SearchActivity extends ActionBarActivity implements AdapterView.OnI
         txtvStatus = (TextView) findViewById(android.R.id.empty);
 
         listView.setOnItemClickListener(this);
-        searchAdapter = new SearchlistAdapter(this, 0, new ArrayList<SearchResult>());
+        //searchAdapter = new SearchlistAdapter(this, 0, new ArrayList<SearchResult>());
         listView.setAdapter(searchAdapter);
         listView.setEmptyView(txtvStatus);
     }
@@ -131,7 +131,7 @@ public class SearchActivity extends ActionBarActivity implements AdapterView.OnI
     @SuppressLint({"NewApi", "NewApi"})
     private void handleSearchRequest(final String query) {
         if (searchAdapter != null) {
-            searchAdapter.clear();
+          //  searchAdapter.clear();
             searchAdapter.notifyDataSetChanged();
         }
         txtvStatus.setText(R.string.search_status_searching);
@@ -154,9 +154,9 @@ public class SearchActivity extends ActionBarActivity implements AdapterView.OnI
                             Log.d(TAG, "Found " + result.size()
                                     + " results");
 
-                        searchAdapter.clear();
+                   //     searchAdapter.clear();
                         for (SearchResult s : result) {
-                            searchAdapter.add(s);
+                   //         searchAdapter.add(s);
                         }
                         searchAdapter.notifyDataSetChanged();
                         txtvStatus
diff --git a/src/de/danoeh/antennapod/adapter/ActionButtonUtils.java b/src/de/danoeh/antennapod/adapter/ActionButtonUtils.java
new file mode 100644
index 000000000..17c61a86c
--- /dev/null
+++ b/src/de/danoeh/antennapod/adapter/ActionButtonUtils.java
@@ -0,0 +1,67 @@
+package de.danoeh.antennapod.adapter;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.view.View;
+import android.widget.ImageButton;
+import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.feed.FeedItem;
+import de.danoeh.antennapod.feed.FeedMedia;
+import de.danoeh.antennapod.storage.DownloadRequester;
+
+/**
+ * Utility methods for the action button that is displayed on the right hand side
+ * of a listitem.
+ */
+public class ActionButtonUtils {
+
+    private final int[] labels;
+    private final TypedArray drawables;
+    private final Context context;
+
+    public ActionButtonUtils(Context context) {
+        if (context == null) throw new IllegalArgumentException("context = null");
+        this.context = context;
+        drawables = context.obtainStyledAttributes(new int[]{
+                R.attr.av_play, R.attr.navigation_cancel, R.attr.av_download, R.attr.navigation_chapters});
+        labels = new int[]{R.string.play_label, R.string.cancel_download_label, R.string.download_label};
+    }
+
+    /**
+     * 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) {
+        if (butSecondary == null || item == null) throw new IllegalArgumentException("butSecondary or item was null");
+        final FeedMedia media = item.getMedia();
+        if (media != null) {
+            final boolean isDownloadingMedia = DownloadRequester.getInstance().isDownloadingFile(media);
+            if (!media.isDownloaded()) {
+                if (isDownloadingMedia) {
+                    // item is being downloaded
+                    butSecondary.setVisibility(View.VISIBLE);
+                    butSecondary.setImageDrawable(drawables
+                            .getDrawable(1));
+                    butSecondary.setContentDescription(context.getString(labels[1]));
+                } else {
+                    // item is not downloaded and not being downloaded
+                    butSecondary.setVisibility(View.VISIBLE);
+                    butSecondary.setImageDrawable(drawables.getDrawable(2));
+                    butSecondary.setContentDescription(context.getString(labels[2]));
+                }
+            } else {
+                // item is not being downloaded
+                butSecondary.setVisibility(View.VISIBLE);
+                if (media.isPlaying()) {
+                    butSecondary.setImageDrawable(drawables.getDrawable(3));
+                } else {
+                    butSecondary
+                            .setImageDrawable(drawables.getDrawable(0));
+                }
+                butSecondary.setContentDescription(context.getString(labels[0]));
+            }
+        } else {
+            butSecondary.setVisibility(View.INVISIBLE);
+        }
+    }
+}
diff --git a/src/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java b/src/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java
new file mode 100644
index 000000000..3acd587af
--- /dev/null
+++ b/src/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java
@@ -0,0 +1,49 @@
+package de.danoeh.antennapod.adapter;
+
+import android.content.Context;
+import android.widget.Toast;
+import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.dialog.DownloadRequestErrorDialogCreator;
+import de.danoeh.antennapod.feed.FeedItem;
+import de.danoeh.antennapod.feed.FeedMedia;
+import de.danoeh.antennapod.storage.DBTasks;
+import de.danoeh.antennapod.storage.DownloadRequestException;
+import de.danoeh.antennapod.storage.DownloadRequester;
+
+/**
+ * Default implementation of an ActionButtonCallback
+ */
+public class DefaultActionButtonCallback implements ActionButtonCallback {
+    private static final String TAG = "DefaultActionButtonCallback";
+
+    private final Context context;
+
+    public DefaultActionButtonCallback(Context context) {
+        if (context == null) throw new IllegalArgumentException("context = null");
+        this.context = context;
+    }
+
+    @Override
+    public void onActionButtonPressed(final FeedItem item) {
+        final FeedMedia media = item.getMedia();
+        if (media == null) {
+            return;
+        }
+
+        boolean isDownloading = DownloadRequester.getInstance().isDownloadingFile(media);
+        if (!isDownloading && !media.isDownloaded()) {
+            try {
+                DBTasks.downloadFeedItems(context, item);
+                Toast.makeText(context, R.string.status_downloading_label, Toast.LENGTH_SHORT).show();
+            } catch (DownloadRequestException e) {
+                e.printStackTrace();
+                DownloadRequestErrorDialogCreator.newRequestErrorDialog(context, e.getMessage());
+            }
+        } else if (isDownloading) {
+            DownloadRequester.getInstance().cancelDownload(context, media);
+            Toast.makeText(context, R.string.download_cancelled_msg, Toast.LENGTH_SHORT).show();
+        } else { // media is downloaded
+            DBTasks.playMedia(context, media, true, true, false);
+        }
+    }
+}
diff --git a/src/de/danoeh/antennapod/adapter/DefaultFeedItemlistAdapter.java b/src/de/danoeh/antennapod/adapter/DefaultFeedItemlistAdapter.java
deleted file mode 100644
index e384ecffc..000000000
--- a/src/de/danoeh/antennapod/adapter/DefaultFeedItemlistAdapter.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package de.danoeh.antennapod.adapter;
-
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.text.format.DateUtils;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Adapter;
-import android.widget.BaseAdapter;
-import android.widget.ImageView;
-import android.widget.TextView;
-import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.feed.FeedItem;
-import de.danoeh.antennapod.feed.MediaType;
-import de.danoeh.antennapod.util.Converter;
-
-public class DefaultFeedItemlistAdapter extends BaseAdapter {
-
-	ItemAccess itemAccess;
-	private Context context;
-
-	public DefaultFeedItemlistAdapter(Context context, ItemAccess itemAccess) {
-		super();
-		this.context = context;
-		if (itemAccess == null) {
-			throw new IllegalArgumentException("itemAccess must not be null");
-		}
-		this.itemAccess = itemAccess;
-	}
-
-	@Override
-	public int getCount() {
-		return itemAccess.getCount();
-
-	}
-
-	@Override
-	public long getItemId(int position) {
-		return position;
-	}
-
-	@Override
-	public FeedItem getItem(int position) {
-		return itemAccess.getItem(position);
-	}
-
-	@Override
-	public View getView(int position, View convertView, ViewGroup parent) {
-		Holder holder;
-		final FeedItem item = getItem(position);
-
-		if (convertView == null) {
-			holder = new Holder();
-			LayoutInflater inflater = (LayoutInflater) context
-					.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-			convertView = inflater.inflate(R.layout.default_feeditemlist_item, null);
-			holder.title = (TextView) convertView
-					.findViewById(R.id.txtvItemname);
-			holder.lenSize = (TextView) convertView
-					.findViewById(R.id.txtvLenSize);
-			
-			holder.published = (TextView) convertView
-					.findViewById(R.id.txtvPublished);
-			holder.type = (ImageView) convertView.findViewById(R.id.imgvType);
-			convertView.setTag(holder);
-			
-		} else {
-			holder = (Holder) convertView.getTag();
-		}
-		if (!(getItemViewType(position) == Adapter.IGNORE_ITEM_VIEW_TYPE)) {
-			convertView.setVisibility(View.VISIBLE);
-			holder.title.setText(item.getTitle());
-			holder.published.setText(convertView.getResources().getString(
-					R.string.published_prefix)
-					+ DateUtils.getRelativeTimeSpanString(
-							item.getPubDate().getTime(),
-							System.currentTimeMillis(), 0, 0));
-			if (item.getMedia() == null) {
-				holder.type.setVisibility(View.GONE);
-				holder.lenSize.setVisibility(View.GONE);
-			} else {
-				holder.lenSize.setVisibility(View.VISIBLE);
-				holder.lenSize.setText(convertView.getResources().getString(
-						R.string.size_prefix)
-						+ Converter.byteToString(item.getMedia().getSize()));
-
-				TypedArray typeDrawables = context
-						.obtainStyledAttributes(new int[] { R.attr.type_audio,
-								R.attr.type_video });
-				MediaType mediaType = item.getMedia().getMediaType();
-				if (mediaType == MediaType.AUDIO) {
-					holder.type.setImageDrawable(typeDrawables.getDrawable(0));
-                    holder.type.setContentDescription(context.getString(R.string.media_type_audio_label));
-					holder.type.setVisibility(View.VISIBLE);
-				} else if (mediaType == MediaType.VIDEO) {
-					holder.type.setImageDrawable(typeDrawables.getDrawable(1));
-                    holder.type.setContentDescription(context.getString(R.string.media_type_video_label));
-                    holder.type.setVisibility(View.VISIBLE);
-				} else {
-					holder.type.setImageBitmap(null);
-					holder.type.setVisibility(View.GONE);
-				}
-			}
-
-		} else {
-			convertView.setVisibility(View.GONE);
-		}
-		return convertView;
-	}
-
-	protected static class Holder {
-		TextView title;
-		TextView published;
-		TextView lenSize;
-		ImageView type;
-
-	}
-
-	public static interface ItemAccess {
-		int getCount();
-
-		FeedItem getItem(int position);
-	}
-
-	protected Context getContext() {
-		return context;
-	}
-}
diff --git a/src/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java b/src/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java
new file mode 100644
index 000000000..0bf770df2
--- /dev/null
+++ b/src/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java
@@ -0,0 +1,119 @@
+package de.danoeh.antennapod.adapter;
+
+import android.content.Context;
+import android.text.format.DateUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.ImageButton;
+import android.widget.ImageView;
+import android.widget.TextView;
+import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.asynctask.ImageLoader;
+import de.danoeh.antennapod.feed.FeedItem;
+import de.danoeh.antennapod.util.Converter;
+
+/**
+ * Shows a list of downloaded episodes
+ */
+public class DownloadedEpisodesListAdapter extends BaseAdapter {
+
+    private final Context context;
+    private final ItemAccess itemAccess;
+
+    public DownloadedEpisodesListAdapter(Context context, ItemAccess itemAccess) {
+        super();
+        this.context = context;
+        this.itemAccess = itemAccess;
+    }
+
+    @Override
+    public int getCount() {
+        return itemAccess.getCount();
+    }
+
+    @Override
+    public FeedItem getItem(int position) {
+        return itemAccess.getItem(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        Holder holder;
+        final FeedItem item = (FeedItem) getItem(position);
+        if (item == null) return null;
+
+        if (convertView == null) {
+            holder = new Holder();
+            LayoutInflater inflater = (LayoutInflater) context
+                    .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+            convertView = inflater.inflate(R.layout.downloaded_episodeslist_item,
+                    null);
+            holder.title = (TextView) convertView.findViewById(R.id.txtvTitle);
+            holder.pubDate = (TextView) convertView
+                    .findViewById(R.id.txtvPublished);
+            holder.butSecondary = (ImageButton) convertView
+                    .findViewById(R.id.butSecondaryAction);
+            holder.imageView = (ImageView) convertView.findViewById(R.id.imgvImage);
+            holder.txtvSize = (TextView) convertView.findViewById(R.id.txtvSize);
+            convertView.setTag(holder);
+        } else {
+            holder = (Holder) convertView.getTag();
+        }
+
+        holder.title.setText(item.getTitle());
+        holder.pubDate.setText(DateUtils.formatDateTime(context, item.getPubDate().getTime(), DateUtils.FORMAT_SHOW_DATE));
+        holder.txtvSize.setText(Converter.byteToString(item.getMedia().getSize()));
+        FeedItem.State state = item.getState();
+
+        if (state == FeedItem.State.PLAYING) {
+            holder.butSecondary.setEnabled(false);
+        } else {
+            holder.butSecondary.setEnabled(true);
+        }
+
+        holder.butSecondary.setFocusable(false);
+        holder.butSecondary.setTag(item);
+        holder.butSecondary.setOnClickListener(secondaryActionListener);
+
+
+        ImageLoader.getInstance().loadThumbnailBitmap(
+                item,
+                holder.imageView,
+                (int) convertView.getResources().getDimension(
+                        R.dimen.thumbnail_length)
+        );
+        return convertView;
+    }
+
+    private View.OnClickListener secondaryActionListener = new View.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            FeedItem item = (FeedItem) v.getTag();
+            itemAccess.onFeedItemSecondaryAction(item);
+        }
+    };
+
+
+    static class Holder {
+        TextView title;
+        TextView pubDate;
+        ImageView imageView;
+        TextView txtvSize;
+        ImageButton butSecondary;
+    }
+
+    public interface ItemAccess {
+        int getCount();
+
+        FeedItem getItem(int position);
+
+        void onFeedItemSecondaryAction(FeedItem item);
+    }
+}
diff --git a/src/de/danoeh/antennapod/adapter/DownloadlistAdapter.java b/src/de/danoeh/antennapod/adapter/DownloadlistAdapter.java
index 2739d2f27..fa2e5a0a7 100644
--- a/src/de/danoeh/antennapod/adapter/DownloadlistAdapter.java
+++ b/src/de/danoeh/antennapod/adapter/DownloadlistAdapter.java
@@ -4,7 +4,8 @@ import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
+import android.widget.BaseAdapter;
+import android.widget.ImageButton;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import de.danoeh.antennapod.R;
@@ -14,86 +15,128 @@ import de.danoeh.antennapod.service.download.Downloader;
 import de.danoeh.antennapod.util.Converter;
 import de.danoeh.antennapod.util.ThemeUtils;
 
-import java.util.List;
-
-public class DownloadlistAdapter extends ArrayAdapter<Downloader> {
-	private int selectedItemIndex;
-
-	public static final int SELECTION_NONE = -1;
-
-	public DownloadlistAdapter(Context context, int textViewResourceId,
-			List<Downloader> objects) {
-		super(context, textViewResourceId, objects);
-		this.selectedItemIndex = SELECTION_NONE;
-	}
-
-	@Override
-	public View getView(int position, View convertView, ViewGroup parent) {
-		Holder holder;
-		DownloadRequest request = getItem(position).getDownloadRequest();
-		// Inflate layout
-		if (convertView == null) {
-			holder = new Holder();
-			LayoutInflater inflater = (LayoutInflater) getContext()
-					.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-			convertView = inflater.inflate(R.layout.downloadlist_item, null);
-			holder.title = (TextView) convertView.findViewById(R.id.txtvTitle);
-			holder.message = (TextView) convertView
-					.findViewById(R.id.txtvMessage);
-			holder.downloaded = (TextView) convertView
-					.findViewById(R.id.txtvDownloaded);
-			holder.percent = (TextView) convertView
-					.findViewById(R.id.txtvPercent);
-			holder.progbar = (ProgressBar) convertView
-					.findViewById(R.id.progProgress);
-
-			convertView.setTag(holder);
-		} else {
-			holder = (Holder) convertView.getTag();
-		}
-
-		if (position == selectedItemIndex) {
-			convertView.setBackgroundColor(convertView.getResources().getColor(
-					ThemeUtils.getSelectionBackgroundColor()));
-		} else {
-			convertView.setBackgroundResource(0);
-		}
-		
-		holder.title.setText(request.getTitle());
-		if (request.getStatusMsg() != 0) {
-			holder.message.setText(request.getStatusMsg());
-		}
-		String strDownloaded = Converter.byteToString(request.getSoFar());
-		if (request.getSize() != DownloadStatus.SIZE_UNKNOWN) {
-			strDownloaded += " / " + Converter.byteToString(request.getSize());
-			holder.percent.setText(request.getProgressPercent() + "%");
-			holder.progbar.setProgress(request.getProgressPercent());
-			holder.percent.setVisibility(View.VISIBLE);
-		} else {
-			holder.progbar.setProgress(0);
-			holder.percent.setVisibility(View.INVISIBLE);
-		}
-
-		holder.downloaded.setText(strDownloaded);
-
-		return convertView;
-	}
-
-	static class Holder {
-		TextView title;
-		TextView message;
-		TextView downloaded;
-		TextView percent;
-		ProgressBar progbar;
-	}
-
-	public int getSelectedItemIndex() {
-		return selectedItemIndex;
-	}
-
-	public void setSelectedItemIndex(int selectedItemIndex) {
-		this.selectedItemIndex = selectedItemIndex;
-		notifyDataSetChanged();
-	}
+public class DownloadlistAdapter extends BaseAdapter {
+
+    public static final int SELECTION_NONE = -1;
+
+    private int selectedItemIndex;
+    private ItemAccess itemAccess;
+    private Context context;
+
+    public DownloadlistAdapter(Context context,
+                               ItemAccess itemAccess) {
+        super();
+        this.selectedItemIndex = SELECTION_NONE;
+        this.context = context;
+        this.itemAccess = itemAccess;
+    }
+
+    @Override
+    public int getCount() {
+        return itemAccess.getCount();
+    }
+
+    @Override
+    public Downloader getItem(int position) {
+        return itemAccess.getItem(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        Holder holder;
+        Downloader downloader  = getItem(position);
+        DownloadRequest request = downloader.getDownloadRequest();
+        // Inflate layout
+        if (convertView == null) {
+            holder = new Holder();
+            LayoutInflater inflater = (LayoutInflater) context
+                    .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+            convertView = inflater.inflate(R.layout.downloadlist_item, null);
+            holder.title = (TextView) convertView.findViewById(R.id.txtvTitle);
+            holder.message = (TextView) convertView
+                    .findViewById(R.id.txtvMessage);
+            holder.downloaded = (TextView) convertView
+                    .findViewById(R.id.txtvDownloaded);
+            holder.percent = (TextView) convertView
+                    .findViewById(R.id.txtvPercent);
+            holder.progbar = (ProgressBar) convertView
+                    .findViewById(R.id.progProgress);
+            holder.butSecondary = (ImageButton) convertView
+                    .findViewById(R.id.butSecondaryAction);
+
+            convertView.setTag(holder);
+        } else {
+            holder = (Holder) convertView.getTag();
+        }
+
+        if (position == selectedItemIndex) {
+            convertView.setBackgroundColor(convertView.getResources().getColor(
+                    ThemeUtils.getSelectionBackgroundColor()));
+        } else {
+            convertView.setBackgroundResource(0);
+        }
+
+        holder.title.setText(request.getTitle());
+        if (request.getStatusMsg() != 0) {
+            holder.message.setText(request.getStatusMsg());
+        }
+        String strDownloaded = Converter.byteToString(request.getSoFar());
+        if (request.getSize() != DownloadStatus.SIZE_UNKNOWN) {
+            strDownloaded += " / " + Converter.byteToString(request.getSize());
+            holder.percent.setText(request.getProgressPercent() + "%");
+            holder.progbar.setProgress(request.getProgressPercent());
+            holder.percent.setVisibility(View.VISIBLE);
+        } else {
+            holder.progbar.setProgress(0);
+            holder.percent.setVisibility(View.INVISIBLE);
+        }
+
+        holder.downloaded.setText(strDownloaded);
+
+        holder.butSecondary.setFocusable(false);
+        holder.butSecondary.setTag(downloader);
+        holder.butSecondary.setOnClickListener(butSecondaryListener);
+
+        return convertView;
+    }
+
+    private View.OnClickListener butSecondaryListener = new View.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            Downloader downloader = (Downloader) v.getTag();
+            itemAccess.onSecondaryActionClick(downloader);
+        }
+    };
+
+    static class Holder {
+        TextView title;
+        TextView message;
+        TextView downloaded;
+        TextView percent;
+        ProgressBar progbar;
+        ImageButton butSecondary;
+    }
+
+    public int getSelectedItemIndex() {
+        return selectedItemIndex;
+    }
+
+    public void setSelectedItemIndex(int selectedItemIndex) {
+        this.selectedItemIndex = selectedItemIndex;
+        notifyDataSetChanged();
+    }
+
+    public interface ItemAccess {
+        public int getCount();
+
+        public Downloader getItem(int position);
+
+        public void onSecondaryActionClick(Downloader downloader);
+    }
 
 }
diff --git a/src/de/danoeh/antennapod/adapter/ExternalEpisodesListAdapter.java b/src/de/danoeh/antennapod/adapter/ExternalEpisodesListAdapter.java
index aa724f991..9a7b607aa 100644
--- a/src/de/danoeh/antennapod/adapter/ExternalEpisodesListAdapter.java
+++ b/src/de/danoeh/antennapod/adapter/ExternalEpisodesListAdapter.java
@@ -227,10 +227,10 @@ public class ExternalEpisodesListAdapter extends BaseExpandableListAdapter {
 				.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
 		convertView = inflater.inflate(R.layout.feeditemlist_header, null);
 		TextView headerTitle = (TextView) convertView
-				.findViewById(R.id.txtvHeaderTitle);
+				.findViewById(0);
 		ImageButton actionButton = (ImageButton) convertView
 				.findViewById(R.id.butAction);	
-		TextView numItems = (TextView) convertView.findViewById(R.id.txtvNumItems);
+		TextView numItems = (TextView) convertView.findViewById(0);
 		
 		String headerString = null;
 		int childrenCount = 0;
diff --git a/src/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java b/src/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java
new file mode 100644
index 000000000..5475f122f
--- /dev/null
+++ b/src/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java
@@ -0,0 +1,243 @@
+package de.danoeh.antennapod.adapter;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.text.format.DateUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.*;
+import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.feed.FeedItem;
+import de.danoeh.antennapod.feed.FeedMedia;
+import de.danoeh.antennapod.feed.MediaType;
+import de.danoeh.antennapod.storage.DownloadRequester;
+import de.danoeh.antennapod.util.Converter;
+import de.danoeh.antennapod.util.ThemeUtils;
+
+/**
+ * List adapter for items of feeds that the user has already subscribed to.
+ */
+public class FeedItemlistAdapter extends BaseAdapter {
+
+    private ActionButtonCallback callback;
+    private final ItemAccess itemAccess;
+    private final Context context;
+    private boolean showFeedtitle;
+    private int selectedItemIndex;
+    private final ActionButtonUtils actionButtonUtils;
+
+    public static final int SELECTION_NONE = -1;
+
+    public FeedItemlistAdapter(Context context,
+                               ItemAccess itemAccess,
+                               ActionButtonCallback callback, boolean showFeedtitle) {
+        super();
+        this.callback = callback;
+        this.context = context;
+        this.itemAccess = itemAccess;
+        this.showFeedtitle = showFeedtitle;
+        this.selectedItemIndex = SELECTION_NONE;
+        this.actionButtonUtils = new ActionButtonUtils(context);
+    }
+
+    @Override
+    public int getCount() {
+        return itemAccess.getCount();
+
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @Override
+    public FeedItem getItem(int position) {
+        return itemAccess.getItem(position);
+    }
+
+    @Override
+    public View getView(final int position, View convertView, ViewGroup parent) {
+        Holder holder;
+        final FeedItem item = getItem(position);
+
+        if (convertView == null) {
+            holder = new Holder();
+            LayoutInflater inflater = (LayoutInflater) context
+                    .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+            convertView = inflater.inflate(R.layout.feeditemlist_item, null);
+            holder.title = (TextView) convertView
+                    .findViewById(R.id.txtvItemname);
+            holder.lenSize = (TextView) convertView
+                    .findViewById(R.id.txtvLenSize);
+            holder.butAction = (ImageButton) convertView
+                    .findViewById(R.id.butSecondaryAction);
+            holder.published = (TextView) convertView
+                    .findViewById(R.id.txtvPublished);
+            holder.inPlaylist = (ImageView) convertView
+                    .findViewById(R.id.imgvInPlaylist);
+            holder.type = (ImageView) convertView.findViewById(R.id.imgvType);
+            holder.statusUnread = (View) convertView
+                    .findViewById(R.id.statusUnread);
+            holder.episodeProgress = (ProgressBar) convertView
+                    .findViewById(R.id.pbar_episode_progress);
+
+            convertView.setTag(holder);
+        } else {
+            holder = (Holder) convertView.getTag();
+        }
+        if (!(getItemViewType(position) == Adapter.IGNORE_ITEM_VIEW_TYPE)) {
+            convertView.setVisibility(View.VISIBLE);
+            if (position == selectedItemIndex) {
+                convertView.setBackgroundColor(convertView.getResources()
+                        .getColor(ThemeUtils.getSelectionBackgroundColor()));
+            } else {
+                convertView.setBackgroundResource(0);
+            }
+
+            StringBuilder buffer = new StringBuilder(item.getTitle());
+            if (showFeedtitle) {
+                buffer.append("(");
+                buffer.append(item.getFeed().getTitle());
+                buffer.append(")");
+            }
+            holder.title.setText(buffer.toString());
+
+            FeedItem.State state = item.getState();
+            switch (state) {
+                case PLAYING:
+                    holder.statusUnread.setVisibility(View.GONE);
+                    holder.episodeProgress.setVisibility(View.VISIBLE);
+                    break;
+                case IN_PROGRESS:
+                    holder.statusUnread.setVisibility(View.GONE);
+                    holder.episodeProgress.setVisibility(View.VISIBLE);
+                    break;
+                case NEW:
+                    holder.statusUnread.setVisibility(View.VISIBLE);
+                    break;
+                default:
+                    holder.statusUnread.setVisibility(View.GONE);
+                    break;
+            }
+
+            holder.published.setText(DateUtils.formatDateTime(context, item.getPubDate().getTime(), DateUtils.FORMAT_SHOW_DATE));
+
+
+            FeedMedia media = item.getMedia();
+            if (media == null) {
+                holder.episodeProgress.setVisibility(View.GONE);
+                holder.inPlaylist.setVisibility(View.INVISIBLE);
+                holder.type.setVisibility(View.INVISIBLE);
+                holder.lenSize.setVisibility(View.INVISIBLE);
+            } else {
+
+                if (state == FeedItem.State.PLAYING
+                        || state == FeedItem.State.IN_PROGRESS) {
+                    if (media.getDuration() > 0) {
+                        holder.episodeProgress
+                                .setProgress((int) (((double) media
+                                        .getPosition()) / media.getDuration() * 100));
+                        holder.lenSize.setText(Converter
+                                .getDurationStringLong(media.getDuration()
+                                        - media.getPosition()));
+                    }
+                } else if (!media.isDownloaded()) {
+                    holder.lenSize.setText(context.getString(
+                            R.string.size_prefix)
+                            + Converter.byteToString(media.getSize()));
+                } else {
+                    holder.lenSize.setText(context.getString(
+                            R.string.length_prefix)
+                            + Converter.getDurationStringLong(media
+                            .getDuration()));
+                }
+
+                holder.lenSize.setVisibility(View.VISIBLE);
+                if (((ItemAccess) itemAccess).isInQueue(item)) {
+                    holder.inPlaylist.setVisibility(View.VISIBLE);
+                } else {
+                    holder.inPlaylist.setVisibility(View.INVISIBLE);
+                }
+
+                if (DownloadRequester.getInstance().isDownloadingFile(
+                        item.getMedia())) {
+                    holder.episodeProgress.setVisibility(View.VISIBLE);
+                    holder.episodeProgress.setProgress(((ItemAccess) itemAccess).getItemDownloadProgressPercent(item));
+                } else if (!(state == FeedItem.State.IN_PROGRESS
+                        || state == FeedItem.State.PLAYING)) {
+                    holder.episodeProgress.setVisibility(View.GONE);
+                }
+
+                TypedArray typeDrawables = context.obtainStyledAttributes(
+                        new int[]{R.attr.type_audio, R.attr.type_video});
+                final int[] labels = new int[]{R.string.media_type_audio_label, R.string.media_type_video_label};
+
+                MediaType mediaType = item.getMedia().getMediaType();
+                if (mediaType == MediaType.AUDIO) {
+                    holder.type.setImageDrawable(typeDrawables.getDrawable(0));
+                    holder.type.setContentDescription(context.getString(labels[0]));
+                    holder.type.setVisibility(View.VISIBLE);
+                } else if (mediaType == MediaType.VIDEO) {
+                    holder.type.setImageDrawable(typeDrawables.getDrawable(1));
+                    holder.type.setContentDescription(context.getString(labels[1]));
+                    holder.type.setVisibility(View.VISIBLE);
+                } else {
+                    holder.type.setImageBitmap(null);
+                    holder.type.setVisibility(View.GONE);
+                }
+            }
+
+            actionButtonUtils.configureActionButton(holder.butAction, item);
+            holder.butAction.setFocusable(false);
+            holder.butAction.setTag(item);
+            holder.butAction.setOnClickListener(butActionListener);
+
+        } else {
+            convertView.setVisibility(View.GONE);
+        }
+        return convertView;
+
+    }
+
+    private final OnClickListener butActionListener = new OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            FeedItem item = (FeedItem) v.getTag();
+            callback.onActionButtonPressed(item);
+        }
+    };
+
+    static class Holder {
+        TextView title;
+        TextView published;
+        TextView lenSize;
+        ImageView type;
+        ImageView inPlaylist;
+        ImageButton butAction;
+        View statusUnread;
+        ProgressBar episodeProgress;
+    }
+
+    public int getSelectedItemIndex() {
+        return selectedItemIndex;
+    }
+
+    public void setSelectedItemIndex(int selectedItemIndex) {
+        this.selectedItemIndex = selectedItemIndex;
+        notifyDataSetChanged();
+    }
+
+    public static interface ItemAccess {
+        public boolean isInQueue(FeedItem item);
+
+        int getItemDownloadProgressPercent(FeedItem item);
+
+        int getCount();
+
+        FeedItem getItem(int position);
+    }
+
+}
diff --git a/src/de/danoeh/antennapod/adapter/InternalFeedItemlistAdapter.java b/src/de/danoeh/antennapod/adapter/InternalFeedItemlistAdapter.java
deleted file mode 100644
index 4681284f5..000000000
--- a/src/de/danoeh/antennapod/adapter/InternalFeedItemlistAdapter.java
+++ /dev/null
@@ -1,230 +0,0 @@
-package de.danoeh.antennapod.adapter;
-
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.text.format.DateUtils;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.widget.*;
-import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.feed.FeedItem;
-import de.danoeh.antennapod.feed.FeedMedia;
-import de.danoeh.antennapod.feed.MediaType;
-import de.danoeh.antennapod.storage.DownloadRequester;
-import de.danoeh.antennapod.util.Converter;
-import de.danoeh.antennapod.util.ThemeUtils;
-
-/** List adapter for items of feeds that the user has already subscribed to. */
-public class InternalFeedItemlistAdapter extends DefaultFeedItemlistAdapter {
-
-	private ActionButtonCallback callback;
-	private boolean showFeedtitle;
-	private int selectedItemIndex;
-
-	public static final int SELECTION_NONE = -1;
-
-	public InternalFeedItemlistAdapter(Context context,
-			ItemAccess itemAccess,
-			ActionButtonCallback callback, boolean showFeedtitle) {
-		super(context, itemAccess);
-		this.callback = callback;
-		this.showFeedtitle = showFeedtitle;
-		this.selectedItemIndex = SELECTION_NONE;
-	}
-
-	@Override
-	public View getView(final int position, View convertView, ViewGroup parent) {
-		Holder holder;
-		final FeedItem item = getItem(position);
-
-		if (convertView == null) {
-			holder = new Holder();
-			LayoutInflater inflater = (LayoutInflater) getContext()
-					.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-			convertView = inflater.inflate(R.layout.feeditemlist_item, null);
-			holder.title = (TextView) convertView
-					.findViewById(R.id.txtvItemname);
-			holder.lenSize = (TextView) convertView
-					.findViewById(R.id.txtvLenSize);
-			holder.butAction = (ImageButton) convertView
-					.findViewById(R.id.butAction);
-			holder.published = (TextView) convertView
-					.findViewById(R.id.txtvPublished);
-			holder.inPlaylist = (ImageView) convertView
-					.findViewById(R.id.imgvInPlaylist);
-			holder.downloaded = (ImageView) convertView
-					.findViewById(R.id.imgvDownloaded);
-			holder.type = (ImageView) convertView.findViewById(R.id.imgvType);
-			holder.downloading = (ImageView) convertView
-					.findViewById(R.id.imgvDownloading);
-			if (showFeedtitle) {
-				holder.feedtitle = (TextView) convertView
-						.findViewById(R.id.txtvFeedname);
-			}
-			holder.statusPlaying = (View) convertView
-					.findViewById(R.id.statusPlaying);
-			holder.statusUnread = (View) convertView
-					.findViewById(R.id.statusUnread);
-			holder.episodeProgress = (ProgressBar) convertView
-					.findViewById(R.id.pbar_episode_progress);
-
-			convertView.setTag(holder);
-		} else {
-			holder = (Holder) convertView.getTag();
-		}
-		if (!(getItemViewType(position) == Adapter.IGNORE_ITEM_VIEW_TYPE)) {
-			convertView.setVisibility(View.VISIBLE);
-			if (position == selectedItemIndex) {
-				convertView.setBackgroundColor(convertView.getResources()
-						.getColor(ThemeUtils.getSelectionBackgroundColor()));
-			} else {
-				convertView.setBackgroundResource(0);
-			}
-
-			holder.title.setText(item.getTitle());
-			if (showFeedtitle) {
-				holder.feedtitle.setVisibility(View.VISIBLE);
-				holder.feedtitle.setText(item.getFeed().getTitle());
-			}
-
-			FeedItem.State state = item.getState();
-			switch (state) {
-			case PLAYING:
-				holder.statusPlaying.setVisibility(View.VISIBLE);
-				holder.statusUnread.setVisibility(View.GONE);
-				holder.episodeProgress.setVisibility(View.VISIBLE);
-				break;
-			case IN_PROGRESS:
-				holder.statusPlaying.setVisibility(View.GONE);
-				holder.statusUnread.setVisibility(View.GONE);
-				holder.episodeProgress.setVisibility(View.VISIBLE);
-				break;
-			case NEW:
-				holder.statusPlaying.setVisibility(View.GONE);
-				holder.statusUnread.setVisibility(View.VISIBLE);
-				holder.episodeProgress.setVisibility(View.GONE);
-				break;
-			default:
-				holder.statusPlaying.setVisibility(View.GONE);
-				holder.statusUnread.setVisibility(View.GONE);
-				holder.episodeProgress.setVisibility(View.GONE);
-				break;
-			}
-
-			holder.published.setText(convertView.getResources().getString(
-					R.string.published_prefix)
-					+ DateUtils.getRelativeTimeSpanString(
-							item.getPubDate().getTime(),
-							System.currentTimeMillis(), 0, 0));
-
-			FeedMedia media = item.getMedia();
-			if (media == null) {
-				holder.downloaded.setVisibility(View.GONE);
-				holder.downloading.setVisibility(View.GONE);
-				holder.inPlaylist.setVisibility(View.GONE);
-				holder.type.setVisibility(View.GONE);
-				holder.lenSize.setVisibility(View.GONE);
-			} else {
-
-				if (state == FeedItem.State.PLAYING
-						|| state == FeedItem.State.IN_PROGRESS) {
-					if (media.getDuration() > 0) {
-						holder.episodeProgress
-								.setProgress((int) (((double) media
-										.getPosition()) / media.getDuration() * 100));
-						holder.lenSize.setText(Converter
-								.getDurationStringLong(media.getDuration()
-										- media.getPosition()));
-					}
-				} else if (!media.isDownloaded()) {
-					holder.lenSize.setText(getContext().getString(
-							R.string.size_prefix)
-							+ Converter.byteToString(media.getSize()));
-				} else {
-					holder.lenSize.setText(getContext().getString(
-							R.string.length_prefix)
-							+ Converter.getDurationStringLong(media
-									.getDuration()));
-				}
-
-				holder.lenSize.setVisibility(View.VISIBLE);
-				if (((ItemAccess) itemAccess).isInQueue(item)) {
-					holder.inPlaylist.setVisibility(View.VISIBLE);
-				} else {
-					holder.inPlaylist.setVisibility(View.GONE);
-				}
-				if (item.getMedia().isDownloaded()) {
-					holder.downloaded.setVisibility(View.VISIBLE);
-				} else {
-					holder.downloaded.setVisibility(View.GONE);
-				}
-
-				if (DownloadRequester.getInstance().isDownloadingFile(
-						item.getMedia())) {
-					holder.downloading.setVisibility(View.VISIBLE);
-				} else {
-					holder.downloading.setVisibility(View.GONE);
-				}
-
-				TypedArray typeDrawables = getContext().obtainStyledAttributes(
-						new int[] { R.attr.type_audio, R.attr.type_video });
-                final int[] labels = new int[] {R.string.media_type_audio_label, R.string.media_type_video_label};
-
-				MediaType mediaType = item.getMedia().getMediaType();
-				if (mediaType == MediaType.AUDIO) {
-					holder.type.setImageDrawable(typeDrawables.getDrawable(0));
-                    holder.type.setContentDescription(getContext().getString(labels[0]));
-					holder.type.setVisibility(View.VISIBLE);
-				} else if (mediaType == MediaType.VIDEO) {
-					holder.type.setImageDrawable(typeDrawables.getDrawable(1));
-                    holder.type.setContentDescription(getContext().getString(labels[1]));
-					holder.type.setVisibility(View.VISIBLE);
-				} else {
-					holder.type.setImageBitmap(null);
-					holder.type.setVisibility(View.GONE);
-				}
-			}
-
-			holder.butAction.setFocusable(false);
-			holder.butAction.setOnClickListener(new OnClickListener() {
-
-				@Override
-				public void onClick(View v) {
-					callback.onActionButtonPressed(item);
-				}
-			});
-
-		} else {
-			convertView.setVisibility(View.GONE);
-		}
-		return convertView;
-
-	}
-
-	static class Holder extends DefaultFeedItemlistAdapter.Holder {
-		TextView feedtitle;
-		ImageView inPlaylist;
-		ImageView downloaded;
-		ImageView downloading;
-		ImageButton butAction;
-		View statusUnread;
-		View statusPlaying;
-		ProgressBar episodeProgress;
-	}
-
-	public int getSelectedItemIndex() {
-		return selectedItemIndex;
-	}
-
-	public void setSelectedItemIndex(int selectedItemIndex) {
-		this.selectedItemIndex = selectedItemIndex;
-		notifyDataSetChanged();
-	}
-
-    public static interface ItemAccess extends DefaultFeedItemlistAdapter.ItemAccess {
-        public boolean isInQueue(FeedItem item);
-    }
-
-}
diff --git a/src/de/danoeh/antennapod/adapter/NavListAdapter.java b/src/de/danoeh/antennapod/adapter/NavListAdapter.java
new file mode 100644
index 000000000..928ec5dde
--- /dev/null
+++ b/src/de/danoeh/antennapod/adapter/NavListAdapter.java
@@ -0,0 +1,198 @@
+package de.danoeh.antennapod.adapter;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Typeface;
+import android.graphics.drawable.Drawable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.ImageView;
+import android.widget.TextView;
+import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.asynctask.ImageLoader;
+import de.danoeh.antennapod.feed.Feed;
+
+/**
+ * BaseAdapter for the navigation drawer
+ */
+public class NavListAdapter extends BaseAdapter {
+    public static final int VIEW_TYPE_COUNT = 3;
+    public static final int VIEW_TYPE_NAV = 0;
+    public static final int VIEW_TYPE_SECTION_DIVIDER = 1;
+    public static final int VIEW_TYPE_SUBSCRIPTION = 2;
+
+    public static final int[] NAV_TITLES = {R.string.all_episodes_label, R.string.queue_label, R.string.downloads_label, R.string.playback_history_label, R.string.add_feed_label};
+
+    private final Drawable[] drawables;
+
+    public static final int SUBSCRIPTION_OFFSET = 1 + NAV_TITLES.length;
+
+    private ItemAccess itemAccess;
+    private Context context;
+
+    public NavListAdapter(ItemAccess itemAccess, Context context) {
+        this.itemAccess = itemAccess;
+        this.context = context;
+
+        TypedArray ta = context.obtainStyledAttributes(new int[] {R.attr.ic_new, R.attr.stat_playlist,
+                R.attr.av_download, R.attr.device_access_time, R.attr.content_new});
+        drawables = new Drawable[] {ta.getDrawable(0), ta.getDrawable(1), ta.getDrawable(2),
+                ta.getDrawable(3), ta.getDrawable(4)};
+        ta.recycle();
+    }
+
+    @Override
+    public int getCount() {
+        return NAV_TITLES.length + 1 + itemAccess.getCount();
+    }
+
+    @Override
+    public Object getItem(int position) {
+        int viewType = getItemViewType(position);
+        if (viewType == VIEW_TYPE_NAV) {
+            return context.getString(NAV_TITLES[position]);
+        } else if (viewType == VIEW_TYPE_SECTION_DIVIDER) {
+            return context.getString(R.string.podcasts_label);
+        } else {
+            return itemAccess.getItem(position);
+        }
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        if (0 <= position && position < NAV_TITLES.length) {
+            return VIEW_TYPE_NAV;
+        } else if (position < NAV_TITLES.length + 1) {
+            return VIEW_TYPE_SECTION_DIVIDER;
+        } else {
+            return VIEW_TYPE_SUBSCRIPTION;
+        }
+    }
+
+    @Override
+    public int getViewTypeCount() {
+        return VIEW_TYPE_COUNT;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        int viewType = getItemViewType(position);
+        View v = null;
+        if (viewType == VIEW_TYPE_NAV) {
+            v = getNavView((String) getItem(position), position, convertView, parent);
+        } else if (viewType == VIEW_TYPE_SECTION_DIVIDER) {
+            v = getSectionDividerView((String) getItem(position), position, convertView, parent);
+        } else {
+            v = getFeedView(position - SUBSCRIPTION_OFFSET, convertView, parent);
+        }
+        if (v != null) {
+            TextView txtvTitle = (TextView) v.findViewById(R.id.txtvTitle);
+            if (position == itemAccess.getSelectedItemIndex()) {
+                txtvTitle.setTypeface(null, Typeface.BOLD);
+            } else {
+                txtvTitle.setTypeface(null, Typeface.NORMAL);
+            }
+        }
+        return v;
+    }
+
+    private View getNavView(String title, int position, View convertView, ViewGroup parent) {
+        NavHolder holder;
+        if (convertView == null) {
+            holder = new NavHolder();
+            LayoutInflater inflater = (LayoutInflater) context
+                    .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+
+            convertView = inflater.inflate(R.layout.nav_listitem, null);
+
+            holder.title = (TextView) convertView.findViewById(R.id.txtvTitle);
+            holder.image = (ImageView) convertView.findViewById(R.id.imgvCover);
+            convertView.setTag(holder);
+        } else {
+            holder = (NavHolder) convertView.getTag();
+        }
+
+        holder.title.setText(title);
+        holder.image.setImageDrawable(drawables[position]);
+
+        return convertView;
+    }
+
+    private View getSectionDividerView(String title, int position, View convertView, ViewGroup parent) {
+        SectionHolder holder;
+        if (convertView == null) {
+            holder = new SectionHolder();
+            LayoutInflater inflater = (LayoutInflater) context
+                    .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+
+            convertView = inflater.inflate(R.layout.nav_section_item, null);
+
+            holder.title = (TextView) convertView.findViewById(R.id.txtvTitle);
+            convertView.setTag(holder);
+        } else {
+            holder = (SectionHolder) convertView.getTag();
+        }
+
+        holder.title.setText(title);
+
+        convertView.setEnabled(false);
+        convertView.setOnClickListener(null);
+
+        return convertView;
+    }
+
+    private View getFeedView(int feedPos, View convertView, ViewGroup parent) {
+        FeedHolder holder;
+        Feed feed = itemAccess.getItem(feedPos);
+
+        if (convertView == null) {
+            holder = new FeedHolder();
+            LayoutInflater inflater = (LayoutInflater) context
+                    .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+
+            convertView = inflater.inflate(R.layout.nav_feedlistitem, null);
+
+            holder.title = (TextView) convertView.findViewById(R.id.txtvTitle);
+            holder.image = (ImageView) convertView.findViewById(R.id.imgvCover);
+            convertView.setTag(holder);
+        } else {
+            holder = (FeedHolder) convertView.getTag();
+        }
+
+        holder.title.setText(feed.getTitle());
+        ImageLoader.getInstance().loadThumbnailBitmap(feed.getImage(), holder.image, (int) context.getResources().getDimension(R.dimen.thumbnail_length_navlist));
+
+        return convertView;
+    }
+
+    static class NavHolder {
+        TextView title;
+        ImageView image;
+    }
+
+    static class SectionHolder {
+        TextView title;
+    }
+
+    static class FeedHolder {
+        TextView title;
+        ImageView image;
+    }
+
+
+    public interface ItemAccess {
+        public int getCount();
+
+        public Feed getItem(int position);
+
+        public int getSelectedItemIndex();
+    }
+
+}
diff --git a/src/de/danoeh/antennapod/adapter/NewEpisodesListAdapter.java b/src/de/danoeh/antennapod/adapter/NewEpisodesListAdapter.java
new file mode 100644
index 000000000..4a959dfd2
--- /dev/null
+++ b/src/de/danoeh/antennapod/adapter/NewEpisodesListAdapter.java
@@ -0,0 +1,160 @@
+package de.danoeh.antennapod.adapter;
+
+import android.content.Context;
+import android.text.format.DateUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.*;
+import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.asynctask.ImageLoader;
+import de.danoeh.antennapod.feed.FeedItem;
+import de.danoeh.antennapod.feed.FeedMedia;
+import de.danoeh.antennapod.storage.DownloadRequester;
+import de.danoeh.antennapod.util.Converter;
+
+/**
+ * List adapter for the list of new episodes
+ */
+public class NewEpisodesListAdapter extends BaseAdapter {
+
+    private final Context context;
+    private final ItemAccess itemAccess;
+    private final ActionButtonCallback actionButtonCallback;
+    private final ActionButtonUtils actionButtonUtils;
+
+    public NewEpisodesListAdapter(Context context, ItemAccess itemAccess, ActionButtonCallback actionButtonCallback) {
+        super();
+        this.context = context;
+        this.itemAccess = itemAccess;
+        this.actionButtonUtils = new ActionButtonUtils(context);
+        this.actionButtonCallback = actionButtonCallback;
+    }
+
+    @Override
+    public int getCount() {
+        return itemAccess.getCount();
+    }
+
+    @Override
+    public Object getItem(int position) {
+        return itemAccess.getItem(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @Override
+    public int getViewTypeCount() {
+        return 1;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        Holder holder;
+        final FeedItem item = (FeedItem) getItem(position);
+        if (item == null) return null;
+
+        if (convertView == null) {
+            holder = new Holder();
+            LayoutInflater inflater = (LayoutInflater) context
+                    .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+            convertView = inflater.inflate(R.layout.new_episodes_listitem,
+                    null);
+            holder.title = (TextView) convertView.findViewById(R.id.txtvTitle);
+            holder.pubDate = (TextView) convertView
+                    .findViewById(R.id.txtvPublished);
+            holder.butSecondary = (ImageButton) convertView
+                    .findViewById(R.id.butSecondaryAction);
+            holder.queueStatus = (ImageView) convertView
+                    .findViewById(R.id.imgvInPlaylist);
+            holder.downloadProgress = (ProgressBar) convertView
+                    .findViewById(R.id.pbar_download_progress);
+            holder.imageView = (ImageView) convertView.findViewById(R.id.imgvImage);
+            holder.txtvDuration = (TextView) convertView.findViewById(R.id.txtvDuration);
+            convertView.setTag(holder);
+        } else {
+            holder = (Holder) convertView.getTag();
+        }
+
+        holder.title.setText(item.getTitle());
+        holder.pubDate.setText(DateUtils.formatDateTime(context, item.getPubDate().getTime(), DateUtils.FORMAT_SHOW_DATE));
+
+        FeedMedia media = item.getMedia();
+        if (media != null) {
+            final boolean isDownloadingMedia = DownloadRequester.getInstance().isDownloadingFile(media);
+
+            if (media.getDuration() > 0) {
+                holder.txtvDuration.setText(Converter.getDurationStringLong(media.getDuration()));
+            } else {
+                holder.txtvDuration.setText("");
+            }
+
+            if (isDownloadingMedia) {
+                holder.downloadProgress.setVisibility(View.VISIBLE);
+                holder.txtvDuration.setVisibility(View.GONE);
+            } else {
+                holder.txtvDuration.setVisibility(View.VISIBLE);
+                holder.downloadProgress.setVisibility(View.GONE);
+            }
+
+            if (!media.isDownloaded()) {
+                if (isDownloadingMedia) {
+                    // item is being downloaded
+                    holder.downloadProgress.setProgress(itemAccess.getItemDownloadProgressPercent(item));
+                }
+            }
+        }
+        if (itemAccess.isInQueue(item)) {
+            holder.queueStatus.setVisibility(View.VISIBLE);
+        } else {
+            holder.queueStatus.setVisibility(View.INVISIBLE);
+        }
+
+        actionButtonUtils.configureActionButton(holder.butSecondary, item);
+        holder.butSecondary.setFocusable(false);
+        holder.butSecondary.setTag(item);
+        holder.butSecondary.setOnClickListener(secondaryActionListener);
+
+
+        ImageLoader.getInstance().loadThumbnailBitmap(
+                item,
+                holder.imageView,
+                (int) convertView.getResources().getDimension(
+                        R.dimen.thumbnail_length)
+        );
+        return convertView;
+    }
+
+    private View.OnClickListener secondaryActionListener = new View.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            FeedItem item = (FeedItem) v.getTag();
+            actionButtonCallback.onActionButtonPressed(item);
+        }
+    };
+
+
+    static class Holder {
+        TextView title;
+        TextView pubDate;
+        ImageView queueStatus;
+        ImageView imageView;
+        ProgressBar downloadProgress;
+        TextView txtvDuration;
+        ImageButton butSecondary;
+    }
+
+    public interface ItemAccess {
+
+        int getCount();
+
+        FeedItem getItem(int position);
+
+        int getItemDownloadProgressPercent(FeedItem item);
+
+        boolean isInQueue(FeedItem item);
+    }
+}
diff --git a/src/de/danoeh/antennapod/adapter/QueueListAdapter.java b/src/de/danoeh/antennapod/adapter/QueueListAdapter.java
new file mode 100644
index 000000000..fb6848a1e
--- /dev/null
+++ b/src/de/danoeh/antennapod/adapter/QueueListAdapter.java
@@ -0,0 +1,130 @@
+package de.danoeh.antennapod.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.*;
+import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.asynctask.ImageLoader;
+import de.danoeh.antennapod.feed.FeedItem;
+import de.danoeh.antennapod.feed.FeedMedia;
+import de.danoeh.antennapod.storage.DownloadRequester;
+
+/**
+ * List adapter for the queue.
+ */
+public class QueueListAdapter extends BaseAdapter {
+
+
+    private final Context context;
+    private final ItemAccess itemAccess;
+    private final ActionButtonCallback actionButtonCallback;
+    private final ActionButtonUtils actionButtonUtils;
+
+    public QueueListAdapter(Context context, ItemAccess itemAccess, ActionButtonCallback actionButtonCallback) {
+        super();
+        this.context = context;
+        this.itemAccess = itemAccess;
+        this.actionButtonUtils = new ActionButtonUtils(context);
+        this.actionButtonCallback = actionButtonCallback;
+
+    }
+
+    @Override
+    public int getCount() {
+        return itemAccess.getCount();
+    }
+
+    @Override
+    public Object getItem(int position) {
+        return itemAccess.getItem(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        Holder holder;
+        final FeedItem item = (FeedItem) getItem(position);
+        if (item == null) return null;
+
+        if (convertView == null) {
+            holder = new Holder();
+            LayoutInflater inflater = (LayoutInflater) context
+                    .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+            convertView = inflater.inflate(R.layout.queue_listitem,
+                    null);
+            holder.title = (TextView) convertView.findViewById(R.id.txtvTitle);
+            holder.butSecondary = (ImageButton) convertView
+                    .findViewById(R.id.butSecondaryAction);
+            holder.downloadProgress = (ProgressBar) convertView
+                    .findViewById(R.id.pbar_download_progress);
+            holder.imageView = (ImageView) convertView.findViewById(R.id.imgvImage);
+            convertView.setTag(holder);
+        } else {
+            holder = (Holder) convertView.getTag();
+        }
+
+        holder.title.setText(item.getTitle());
+
+        FeedMedia media = item.getMedia();
+        if (media != null) {
+            final boolean isDownloadingMedia = DownloadRequester.getInstance().isDownloadingFile(media);
+
+
+            if (isDownloadingMedia) {
+                holder.downloadProgress.setVisibility(View.VISIBLE);
+            } else {
+                holder.downloadProgress.setVisibility(View.GONE);
+            }
+            if (!media.isDownloaded()) {
+                if (isDownloadingMedia) {
+                    // item is being downloaded
+                    holder.downloadProgress.setProgress(itemAccess.getItemDownloadProgressPercent(item));
+                }
+            }
+        }
+
+        actionButtonUtils.configureActionButton(holder.butSecondary, item);
+        holder.butSecondary.setFocusable(false);
+        holder.butSecondary.setTag(item);
+        holder.butSecondary.setOnClickListener(secondaryActionListener);
+
+
+        ImageLoader.getInstance().loadThumbnailBitmap(
+                item,
+                holder.imageView,
+                (int) convertView.getResources().getDimension(
+                        R.dimen.thumbnail_length)
+        );
+        return convertView;
+    }
+
+    private View.OnClickListener secondaryActionListener = new View.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            FeedItem item = (FeedItem) v.getTag();
+            actionButtonCallback.onActionButtonPressed(item);
+        }
+    };
+
+
+    static class Holder {
+        TextView title;
+        ImageView imageView;
+        ProgressBar downloadProgress;
+        ImageButton butSecondary;
+    }
+
+    public interface ItemAccess {
+        int getCount();
+
+        FeedItem getItem(int position);
+
+        int getItemDownloadProgressPercent(FeedItem item);
+    }
+}
diff --git a/src/de/danoeh/antennapod/adapter/SearchlistAdapter.java b/src/de/danoeh/antennapod/adapter/SearchlistAdapter.java
index 926a5a5ad..5c6af3943 100644
--- a/src/de/danoeh/antennapod/adapter/SearchlistAdapter.java
+++ b/src/de/danoeh/antennapod/adapter/SearchlistAdapter.java
@@ -5,6 +5,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
+import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
 import de.danoeh.antennapod.R;
@@ -17,14 +18,32 @@ import de.danoeh.antennapod.feed.SearchResult;
 import java.util.List;
 
 /** List adapter for search activity. */
-public class SearchlistAdapter extends ArrayAdapter<SearchResult> {
+public class SearchlistAdapter extends BaseAdapter {
 
-	public SearchlistAdapter(Context context, int textViewResourceId,
-			List<SearchResult> objects) {
-		super(context, textViewResourceId, objects);
-	}
+	private final Context context;
+    private final ItemAccess itemAccess;
+
+    public SearchlistAdapter(Context context, ItemAccess itemAccess) {
+        this.context = context;
+        this.itemAccess = itemAccess;
+    }
+
+    @Override
+    public int getCount() {
+        return itemAccess.getCount();
+    }
 
-	@Override
+    @Override
+    public SearchResult getItem(int position) {
+        return itemAccess.getItem(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return 0;
+    }
+
+    @Override
 	public View getView(int position, View convertView, ViewGroup parent) {
 		final Holder holder;
 		SearchResult result = getItem(position);
@@ -33,7 +52,7 @@ public class SearchlistAdapter extends ArrayAdapter<SearchResult> {
 		// Inflate Layout
 		if (convertView == null) {
 			holder = new Holder();
-			LayoutInflater inflater = (LayoutInflater) getContext()
+			LayoutInflater inflater = (LayoutInflater) context
 					.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
 
 			convertView = inflater.inflate(R.layout.searchlist_item, null);
@@ -78,4 +97,9 @@ public class SearchlistAdapter extends ArrayAdapter<SearchResult> {
 		TextView subtitle;
 	}
 
+    public static interface ItemAccess {
+        int getCount();
+        SearchResult getItem(int position);
+    }
+
 }
diff --git a/src/de/danoeh/antennapod/asynctask/DownloadObserver.java b/src/de/danoeh/antennapod/asynctask/DownloadObserver.java
index 40388cde5..1c5003ab3 100644
--- a/src/de/danoeh/antennapod/asynctask/DownloadObserver.java
+++ b/src/de/danoeh/antennapod/asynctask/DownloadObserver.java
@@ -23,9 +23,9 @@ public class DownloadObserver {
     /**
      * Time period between update notifications.
      */
-    public static final int WAITING_INTERVAL_MS = 1000;
+    public static final int WAITING_INTERVAL_MS = 3000;
 
-    private final Activity activity;
+    private volatile Activity activity;
     private final Handler handler;
     private final Callback callback;
 
@@ -57,19 +57,31 @@ public class DownloadObserver {
     public void onResume() {
         if (BuildConfig.DEBUG) Log.d(TAG, "DownloadObserver resumed");
         activity.registerReceiver(contentChangedReceiver, new IntentFilter(DownloadService.ACTION_DOWNLOADS_CONTENT_CHANGED));
-        activity.bindService(new Intent(activity, DownloadService.class), mConnection, 0);
+        connectToDownloadService();
     }
 
     public void onPause() {
         if (BuildConfig.DEBUG) Log.d(TAG, "DownloadObserver paused");
-        activity.unregisterReceiver(contentChangedReceiver);
-        activity.unbindService(mConnection);
+        try {
+            activity.unregisterReceiver(contentChangedReceiver);
+        } catch (IllegalArgumentException e) {
+            e.printStackTrace();
+        }
+        try {
+            activity.unbindService(mConnection);
+        } catch (IllegalArgumentException e) {
+            e.printStackTrace();
+        }
         stopRefresher();
     }
 
     private BroadcastReceiver contentChangedReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
+            // reconnect to DownloadService if connection has been closed
+            if (downloadService == null) {
+                connectToDownloadService();
+            }
             callback.onContentChanged();
             startRefresher();
         }
@@ -81,6 +93,10 @@ public class DownloadObserver {
         void onDownloadDataAvailable(List<Downloader> downloaderList);
     }
 
+    private void connectToDownloadService() {
+        activity.bindService(new Intent(activity, DownloadService.class), mConnection, 0);
+    }
+
     private ServiceConnection mConnection = new ServiceConnection() {
         public void onServiceDisconnected(ComponentName className) {
             downloadService = null;
@@ -138,13 +154,21 @@ public class DownloadObserver {
                 @Override
                 public void run() {
                     callback.onContentChanged();
-                    List<Downloader> downloaderList = downloadService.getDownloads();
-                    if (downloaderList == null || downloaderList.isEmpty()) {
-                        Thread.currentThread().interrupt();
+                    if (downloadService != null) {
+                        List<Downloader> downloaderList = downloadService.getDownloads();
+                        if (downloaderList == null || downloaderList.isEmpty()) {
+                            Thread.currentThread().interrupt();
+                        }
                     }
                 }
             });
         }
     }
 
+    public void setActivity(Activity activity) {
+        if (activity == null) throw new IllegalArgumentException("activity = null");
+        this.activity = activity;
+    }
+
 }
+
diff --git a/src/de/danoeh/antennapod/dialog/FeedItemDialog.java b/src/de/danoeh/antennapod/dialog/FeedItemDialog.java
new file mode 100644
index 000000000..8db4c9d19
--- /dev/null
+++ b/src/de/danoeh/antennapod/dialog/FeedItemDialog.java
@@ -0,0 +1,398 @@
+package de.danoeh.antennapod.dialog;
+
+import android.app.Dialog;
+import android.content.ActivityNotFoundException;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.TypedArray;
+import android.net.Uri;
+import android.os.AsyncTask;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.v7.widget.PopupMenu;
+import android.util.Log;
+import android.util.TypedValue;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.Window;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+import android.widget.ImageButton;
+import android.widget.TextView;
+import android.widget.Toast;
+import de.danoeh.antennapod.BuildConfig;
+import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.adapter.DefaultActionButtonCallback;
+import de.danoeh.antennapod.feed.FeedItem;
+import de.danoeh.antennapod.feed.FeedMedia;
+import de.danoeh.antennapod.preferences.UserPreferences;
+import de.danoeh.antennapod.storage.DBTasks;
+import de.danoeh.antennapod.storage.DBWriter;
+import de.danoeh.antennapod.storage.DownloadRequestException;
+import de.danoeh.antennapod.storage.DownloadRequester;
+import de.danoeh.antennapod.util.QueueAccess;
+import de.danoeh.antennapod.util.ShownotesProvider;
+import de.danoeh.antennapod.util.menuhandler.FeedItemMenuHandler;
+import org.apache.commons.lang3.StringEscapeUtils;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.Callable;
+
+/**
+ * Shows information about a specific FeedItem and provides actions like playing, downloading, etc.
+ */
+public class FeedItemDialog extends Dialog {
+    private static final String TAG = "FeedItemDialog";
+
+    private FeedItem item;
+    private QueueAccess queue;
+
+    private View header;
+    private TextView txtvTitle;
+    private WebView webvDescription;
+    private ImageButton butAction1;
+    private ImageButton butAction2;
+    private ImageButton butMore;
+    private PopupMenu popupMenu;
+
+    public static FeedItemDialog newInstance(Context context, FeedItemDialogSavedInstance savedInstance) {
+        if (savedInstance == null) throw new IllegalArgumentException("savedInstance = null");
+        FeedItemDialog dialog = newInstance(context, savedInstance.item, savedInstance.queueAccess);
+        if (savedInstance.isShowing) {
+            dialog.show();
+        }
+        return dialog;
+    }
+
+    public static FeedItemDialog newInstance(Context context, FeedItem item, QueueAccess queue) {
+        if (useDarkThemeWorkAround()) {
+            return new FeedItemDialog(context, R.style.Theme_AntennaPod_Dark, item, queue);
+        } else {
+            return new FeedItemDialog(context, item, queue);
+        }
+    }
+
+    public FeedItemDialog(Context context, int theme, FeedItem item, QueueAccess queue) {
+        super(context, theme);
+        if (item == null) throw new IllegalArgumentException("item = null");
+        if (queue == null) throw new IllegalArgumentException("queue = null");
+        this.item = item;
+        this.queue = queue;
+    }
+
+    private FeedItemDialog(Context context, FeedItem item, QueueAccess queue) {
+        this(context, 0, item, queue);
+    }
+
+    /**
+     * Returns true if the dialog should use a dark theme. This has to be done on Gingerbread devices
+     * because dialogs are only available in a dark theme.
+     */
+    private static boolean useDarkThemeWorkAround() {
+        return Build.VERSION.SDK_INT <= Build.VERSION_CODES.GINGERBREAD_MR1
+                && UserPreferences.getTheme() != R.style.Theme_AntennaPod_Dark;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        requestWindowFeature(Window.FEATURE_NO_TITLE);
+        setContentView(R.layout.feeditem_dialog);
+
+        txtvTitle = (TextView) findViewById(R.id.txtvTitle);
+        header = findViewById(R.id.header);
+        webvDescription = (WebView) findViewById(R.id.webview);
+        butAction1 = (ImageButton) findViewById(R.id.butAction1);
+        butAction2 = (ImageButton) findViewById(R.id.butAction2);
+        butMore = (ImageButton) findViewById(R.id.butMoreActions);
+        popupMenu = new PopupMenu(getContext(), butMore);
+
+        webvDescription.setWebViewClient(new WebViewClient());
+        txtvTitle.setText(item.getTitle());
+
+        if (UserPreferences.getTheme() == R.style.Theme_AntennaPod_Dark) {
+            if (Build.VERSION.SDK_INT >= 11
+                    && Build.VERSION.SDK_INT <= Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1) {
+                webvDescription.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
+            }
+            webvDescription.setBackgroundColor(getContext().getResources().getColor(
+                    R.color.black));
+        }
+        webvDescription.getSettings().setUseWideViewPort(false);
+        webvDescription.getSettings().setLayoutAlgorithm(
+                WebSettings.LayoutAlgorithm.NARROW_COLUMNS);
+        webvDescription.getSettings().setLoadWithOverviewMode(true);
+        webvDescription.setWebViewClient(new WebViewClient() {
+
+            @Override
+            public boolean shouldOverrideUrlLoading(WebView view, String url) {
+                Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+                try {
+                    getContext().startActivity(intent);
+                } catch (ActivityNotFoundException e) {
+                    e.printStackTrace();
+                    return false;
+                }
+                return true;
+            }
+        });
+
+        loadDescriptionWebview(item);
+
+        butAction1.setOnClickListener(new View.OnClickListener() {
+                                          DefaultActionButtonCallback actionButtonCallback = new DefaultActionButtonCallback(getContext());
+
+                                          @Override
+
+                                          public void onClick(View v) {
+                                              FeedMedia media = item.getMedia();
+                                              if (media == null) {
+                                                  return;
+                                              }
+                                              actionButtonCallback.onActionButtonPressed(item);
+
+                                          }
+                                      }
+        );
+
+        butAction2.setOnClickListener(new View.OnClickListener()
+
+                                      {
+                                          @Override
+                                          public void onClick(View v) {
+                                              FeedMedia media = item.getMedia();
+                                              if (media == null) {
+                                                  return;
+                                              }
+
+                                              if (!media.isDownloaded()) {
+                                                  DBTasks.playMedia(getContext(), media, true, true, true);
+                                                  dismiss();
+                                              } else {
+                                                  DBWriter.deleteFeedMediaOfItem(getContext(), media.getId());
+                                              }
+                                          }
+                                      }
+        );
+
+        butMore.setOnClickListener(new View.OnClickListener() {
+                                       @Override
+                                       public void onClick(View v) {
+                                           popupMenu.getMenu().clear();
+                                           popupMenu.inflate(R.menu.feeditem_dialog);
+                                           FeedItemMenuHandler.onPrepareMenu(popupMenuInterface, item, true, queue);
+                                           popupMenu.show();
+                                       }
+                                   }
+        );
+
+        popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
+                                                 @Override
+                                                 public boolean onMenuItemClick(MenuItem menuItem) {
+
+                                                     try {
+                                                         return FeedItemMenuHandler.onMenuItemClicked(getContext(), menuItem.getItemId(), item);
+                                                     } catch (DownloadRequestException e) {
+                                                         e.printStackTrace();
+                                                         Toast.makeText(getContext(), e.getMessage(), Toast.LENGTH_LONG).show();
+                                                         return true;
+                                                     }
+                                                 }
+                                             }
+        );
+
+        updateMenuAppearance();
+    }
+
+
+    private final FeedItemMenuHandler.MenuInterface popupMenuInterface = new FeedItemMenuHandler.MenuInterface() {
+        @Override
+        public void setItemVisibility(int id, boolean visible) {
+            MenuItem item = popupMenu.getMenu().findItem(id);
+            if (item != null) {
+                item.setVisible(visible);
+            }
+        }
+    };
+
+    public void updateMenuAppearance() {
+        if (item == null || queue == null) {
+            Log.w(TAG, "UpdateMenuAppearance called while item or queue was null");
+            return;
+        }
+        FeedMedia media = item.getMedia();
+        if (media == null) {
+            header.setVisibility(View.GONE);
+        } else {
+            header.setVisibility(View.VISIBLE);
+            boolean isDownloading = DownloadRequester.getInstance().isDownloadingFile(media);
+            TypedArray drawables = getContext().obtainStyledAttributes(new int[]{R.attr.av_play,
+                    R.attr.av_download, R.attr.action_stream, R.attr.content_discard, R.attr.navigation_cancel});
+
+            if (!media.isDownloaded()) {
+                butAction2.setImageDrawable(drawables.getDrawable(2));
+                butAction2.setContentDescription(getContext().getString(R.string.stream_label));
+            } else {
+                butAction2.setImageDrawable(drawables.getDrawable(3));
+                butAction2.setContentDescription(getContext().getString(R.string.remove_episode_lable));
+            }
+
+            if (isDownloading) {
+                butAction1.setImageDrawable(drawables.getDrawable(4));
+                butAction1.setContentDescription(getContext().getString(R.string.cancel_download_label));
+            } else if (media.isDownloaded()) {
+                butAction1.setImageDrawable(drawables.getDrawable(0));
+                butAction1.setContentDescription(getContext().getString(R.string.play_label));
+            } else {
+                butAction1.setImageDrawable(drawables.getDrawable(1));
+                butAction1.setContentDescription(getContext().getString(R.string.download_label));
+            }
+
+            drawables.recycle();
+        }
+    }
+
+
+    private void loadDescriptionWebview(final ShownotesProvider shownotesProvider) {
+        AsyncTask<Void, Void, Void> loadTask = new AsyncTask<Void, Void, Void>() {
+            String data;
+
+
+            private String applyWebviewStyle(String textColor, String data) {
+                final String WEBVIEW_STYLE = "<html><head><style type=\"text/css\"> @font-face { font-family: 'Roboto-Light'; src: url('file:///android_asset/Roboto-Light.ttf'); } * { color: %s; font-family: roboto-Light; font-size: 11pt; } a { font-style: normal; text-decoration: none; font-weight: normal; color: #00A8DF; } img { display: block; margin: 10 auto; max-width: %s; height: auto; } body { margin: %dpx %dpx %dpx %dpx; }</style></head><body>%s</body></html>";
+                final int pageMargin = (int) TypedValue.applyDimension(
+                        TypedValue.COMPLEX_UNIT_DIP, 8, getContext().getResources()
+                                .getDisplayMetrics()
+                );
+                return String.format(WEBVIEW_STYLE, textColor, "100%", pageMargin,
+                        pageMargin, pageMargin, pageMargin, data);
+            }
+
+
+            @Override
+            protected void onPostExecute(Void result) {
+                super.onPostExecute(result);
+                // /webvDescription.loadData(url, "text/html", "utf-8");
+                if (FeedItemDialog.this.isShowing() && webvDescription != null) {
+                    webvDescription.loadDataWithBaseURL(null, data, "text/html",
+                            "utf-8", "about:blank");
+                    if (BuildConfig.DEBUG)
+                        Log.d(TAG, "Webview loaded");
+                }
+            }
+
+
+            @Override
+            protected Void doInBackground(Void... params) {
+                if (BuildConfig.DEBUG)
+                    Log.d(TAG, "Loading Webview");
+                try {
+                    Callable<String> shownotesLoadTask = shownotesProvider.loadShownotes();
+                    final String shownotes = shownotesLoadTask.call();
+
+                    data = StringEscapeUtils.unescapeHtml4(shownotes);
+                    TypedArray res = getContext()
+                            .getTheme()
+                            .obtainStyledAttributes(
+                                    new int[]{android.R.attr.textColorPrimary});
+                    int colorResource;
+                    if (useDarkThemeWorkAround()) {
+                        colorResource = getContext().getResources().getColor(R.color.black);
+                    } else {
+                        colorResource = res.getColor(0, 0);
+                    }
+                    String colorString = String.format("#%06X",
+                            0xFFFFFF & colorResource);
+                    Log.i(TAG, "text color: " + colorString);
+                    res.recycle();
+                    data = applyWebviewStyle(colorString, data);
+
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                return null;
+            }
+
+        };
+        loadTask.execute();
+    }
+
+    /**
+     * Convenience method that calls setQueue() and setItemFromCollection() with
+     * the given arguments.
+     *
+     * @return true if one of the calls to setItemFromCollection returned true,
+     * false otherwise.
+     */
+    public boolean updateContent(QueueAccess queue, List<FeedItem>... collections) {
+        setQueue(queue);
+
+        boolean setItemFromCollectionResult = false;
+        if (collections != null) {
+            for (List<FeedItem> list : collections) {
+                setItemFromCollectionResult |= setItemFromCollection(list);
+            }
+        }
+        if (isShowing()) {
+            updateMenuAppearance();
+        }
+
+        return setItemFromCollectionResult;
+    }
+
+
+    public void setItem(FeedItem item) {
+        if (item == null) throw new IllegalArgumentException("item = null");
+        this.item = item;
+    }
+
+    /**
+     * Finds the FeedItem of this dialog in a collection and updates its state from that
+     * collection.
+     *
+     * @return true if the FeedItem was found, false otherwise.
+     */
+    public boolean setItemFromCollection(Collection<FeedItem> items) {
+        for (FeedItem item : items) {
+            if (item.getId() == this.item.getId()) {
+                setItem(item);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public void setQueue(QueueAccess queue) {
+        if (queue == null) throw new IllegalArgumentException("queue = null");
+        this.queue = queue;
+    }
+
+    public FeedItem getItem() {
+        return item;
+    }
+
+    public QueueAccess getQueue() {
+        return queue;
+    }
+
+    public FeedItemDialogSavedInstance save() {
+        return new FeedItemDialogSavedInstance(item, queue, isShowing());
+    }
+
+    /**
+     * Used to save the FeedItemDialog's state across configuration changes
+     * */
+    public static class FeedItemDialogSavedInstance {
+        final FeedItem item;
+        final QueueAccess queueAccess;
+        final boolean isShowing;
+
+        private FeedItemDialogSavedInstance(FeedItem item, QueueAccess queueAccess, boolean isShowing) {
+            this.item = item;
+            this.queueAccess = queueAccess;
+            this.isShowing = isShowing;
+        }
+    }
+}
diff --git a/src/de/danoeh/antennapod/fragment/AddFeedFragment.java b/src/de/danoeh/antennapod/fragment/AddFeedFragment.java
new file mode 100644
index 000000000..f5ae5a777
--- /dev/null
+++ b/src/de/danoeh/antennapod/fragment/AddFeedFragment.java
@@ -0,0 +1,76 @@
+package de.danoeh.antennapod.fragment;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.EditText;
+import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.activity.DefaultOnlineFeedViewActivity;
+import de.danoeh.antennapod.activity.MainActivity;
+import de.danoeh.antennapod.activity.OnlineFeedViewActivity;
+import de.danoeh.antennapod.activity.OpmlImportFromPathActivity;
+import de.danoeh.antennapod.fragment.gpodnet.GpodnetMainFragment;
+
+/**
+ * Provides actions for adding new podcast subscriptions
+ */
+public class AddFeedFragment extends Fragment {
+    private static final String TAG = "AddFeedFragment";
+
+    /**
+     * Preset value for url text field.
+     */
+    public static final String ARG_FEED_URL = "feedurl";
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        super.onCreateView(inflater, container, savedInstanceState);
+        View root = inflater.inflate(R.layout.addfeed, container, false);
+
+        final EditText etxtFeedurl = (EditText) root.findViewById(R.id.etxtFeedurl);
+
+        Bundle args = getArguments();
+        if (args != null && args.getString(ARG_FEED_URL) != null) {
+            etxtFeedurl.setText(args.getString(ARG_FEED_URL));
+        }
+
+        Button butBrowserGpoddernet = (Button) root.findViewById(R.id.butBrowseGpoddernet);
+        Button butOpmlImport = (Button) root.findViewById(R.id.butOpmlImport);
+        Button butConfirm = (Button) root.findViewById(R.id.butConfirm);
+
+        final MainActivity activity = (MainActivity) getActivity();
+        activity.getMainActivtyActionBar().setTitle(R.string.add_feed_label);
+
+        butBrowserGpoddernet.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                activity.loadChildFragment(new GpodnetMainFragment());
+            }
+        });
+
+        butOpmlImport.setOnClickListener(new View.OnClickListener() {
+
+            @Override
+            public void onClick(View v) {
+                startActivity(new Intent(getActivity(),
+                        OpmlImportFromPathActivity.class));
+            }
+        });
+
+        butConfirm.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent(getActivity(), DefaultOnlineFeedViewActivity.class);
+                intent.putExtra(OnlineFeedViewActivity.ARG_FEEDURL, etxtFeedurl.getText().toString());
+                intent.putExtra(OnlineFeedViewActivity.ARG_TITLE, getString(R.string.add_feed_label));
+                startActivity(intent);
+            }
+        });
+
+        return root;
+    }
+}
diff --git a/src/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java b/src/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java
new file mode 100644
index 000000000..ed304ad37
--- /dev/null
+++ b/src/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java
@@ -0,0 +1,195 @@
+package de.danoeh.antennapod.fragment;
+
+import android.app.Activity;
+import android.content.Context;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.support.v4.app.ListFragment;
+import android.view.View;
+import android.widget.ListView;
+import de.danoeh.antennapod.adapter.DownloadedEpisodesListAdapter;
+import de.danoeh.antennapod.dialog.FeedItemDialog;
+import de.danoeh.antennapod.feed.EventDistributor;
+import de.danoeh.antennapod.feed.FeedItem;
+import de.danoeh.antennapod.storage.DBReader;
+import de.danoeh.antennapod.storage.DBWriter;
+import de.danoeh.antennapod.util.QueueAccess;
+
+import java.util.List;
+
+/**
+ * Displays all running downloads and provides a button to delete them
+ */
+public class CompletedDownloadsFragment extends ListFragment {
+    private static final int EVENTS =
+            EventDistributor.DOWNLOAD_HANDLED |
+                    EventDistributor.DOWNLOADLOG_UPDATE |
+                    EventDistributor.QUEUE_UPDATE |
+                    EventDistributor.UNREAD_ITEMS_UPDATE;
+
+    private List<FeedItem> items;
+    private QueueAccess queue;
+    private DownloadedEpisodesListAdapter listAdapter;
+
+    private boolean viewCreated = false;
+    private boolean itemsLoaded = false;
+
+    private FeedItemDialog feedItemDialog;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        startItemLoader();
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        EventDistributor.getInstance().register(contentUpdate);
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        EventDistributor.getInstance().unregister(contentUpdate);
+        stopItemLoader();
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        stopItemLoader();
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        listAdapter = null;
+        viewCreated = false;
+        feedItemDialog = null;
+    }
+
+    @Override
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+        if (viewCreated && itemsLoaded) {
+            onFragmentLoaded();
+        }
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        viewCreated = true;
+        if (itemsLoaded && getActivity() != null) {
+            onFragmentLoaded();
+        }
+    }
+
+    @Override
+    public void onListItemClick(ListView l, View v, int position, long id) {
+        super.onListItemClick(l, v, position, id);
+        FeedItem item = listAdapter.getItem(position - l.getHeaderViewsCount());
+        if (item != null) {
+            feedItemDialog = FeedItemDialog.newInstance(getActivity(), item, queue);
+            feedItemDialog.show();
+        }
+
+    }
+
+    private void onFragmentLoaded() {
+        if (listAdapter == null) {
+            listAdapter = new DownloadedEpisodesListAdapter(getActivity(), itemAccess);
+            setListAdapter(listAdapter);
+        }
+        listAdapter.notifyDataSetChanged();
+        if (feedItemDialog != null) {
+            boolean res = feedItemDialog.updateContent(queue, items);
+            if (!res && feedItemDialog.isShowing()) {
+                feedItemDialog.dismiss();
+            }
+        }
+    }
+
+    private DownloadedEpisodesListAdapter.ItemAccess itemAccess = new DownloadedEpisodesListAdapter.ItemAccess() {
+        @Override
+        public int getCount() {
+            return (items != null) ? items.size() : 0;
+        }
+
+        @Override
+        public FeedItem getItem(int position) {
+            return (items != null) ? items.get(position) : null;
+        }
+
+        @Override
+        public void onFeedItemSecondaryAction(FeedItem item) {
+            DBWriter.deleteFeedMediaOfItem(getActivity(), item.getMedia().getId());
+        }
+    };
+
+    private EventDistributor.EventListener contentUpdate = new EventDistributor.EventListener() {
+        @Override
+        public void update(EventDistributor eventDistributor, Integer arg) {
+            if ((arg & EventDistributor.DOWNLOAD_QUEUED) != 0) {
+                if (feedItemDialog != null && feedItemDialog.isShowing()) {
+                    feedItemDialog.updateMenuAppearance();
+                }
+            } else if ((arg & EVENTS) != 0) {
+                startItemLoader();
+            }
+        }
+    };
+
+    private ItemLoader itemLoader;
+
+    private void startItemLoader() {
+        if (itemLoader != null) {
+            itemLoader.cancel(true);
+        }
+        itemLoader = new ItemLoader();
+        itemLoader.execute();
+    }
+
+    private void stopItemLoader() {
+        if (itemLoader != null) {
+            itemLoader.cancel(true);
+        }
+    }
+
+    private class ItemLoader extends AsyncTask<Void, Void, Object[]> {
+
+        @Override
+        protected void onPreExecute() {
+            super.onPreExecute();
+            if (!itemsLoaded && viewCreated) {
+                setListShown(false);
+            }
+        }
+
+        @Override
+        protected void onPostExecute(Object[] results) {
+            super.onPostExecute(results);
+            setListShown(true);
+            if (results != null) {
+                items = (List<FeedItem>) results[0];
+                queue = (QueueAccess) results[1];
+                itemsLoaded = true;
+                if (viewCreated && getActivity() != null) {
+                    onFragmentLoaded();
+                }
+            }
+        }
+
+        @Override
+        protected Object[] doInBackground(Void... params) {
+            Context context = getActivity();
+            if (context != null) {
+                return new Object[]{DBReader.getDownloadedItems(context),
+                        QueueAccess.IDListAccess(DBReader.getQueueIDList(context))};
+            }
+            return null;
+        }
+    }
+}
diff --git a/src/de/danoeh/antennapod/fragment/DownloadLogFragment.java b/src/de/danoeh/antennapod/fragment/DownloadLogFragment.java
new file mode 100644
index 000000000..d81ba4b86
--- /dev/null
+++ b/src/de/danoeh/antennapod/fragment/DownloadLogFragment.java
@@ -0,0 +1,121 @@
+package de.danoeh.antennapod.fragment;
+
+import android.content.Context;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.support.v4.app.ListFragment;
+import android.view.View;
+import de.danoeh.antennapod.adapter.DownloadLogAdapter;
+import de.danoeh.antennapod.feed.EventDistributor;
+import de.danoeh.antennapod.service.download.DownloadStatus;
+import de.danoeh.antennapod.storage.DBReader;
+
+import java.util.List;
+
+/**
+ * Shows the download log
+ */
+public class DownloadLogFragment extends ListFragment {
+
+    private List<DownloadStatus> downloadLog;
+    private DownloadLogAdapter adapter;
+
+    private boolean viewsCreated = false;
+    private boolean itemsLoaded = false;
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        EventDistributor.getInstance().register(contentUpdate);
+        startItemLoader();
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        EventDistributor.getInstance().unregister(contentUpdate);
+        stopItemLoader();
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        viewsCreated = true;
+        if (itemsLoaded) {
+            onFragmentLoaded();
+        }
+    }
+
+    private void onFragmentLoaded() {
+        if (adapter == null) {
+            adapter = new DownloadLogAdapter(getActivity(), itemAccess);
+            setListAdapter(adapter);
+        }
+        setListShown(true);
+        adapter.notifyDataSetChanged();
+
+    }
+
+    private DownloadLogAdapter.ItemAccess itemAccess = new DownloadLogAdapter.ItemAccess() {
+
+        @Override
+        public int getCount() {
+            return (downloadLog != null) ? downloadLog.size() : 0;
+        }
+
+        @Override
+        public DownloadStatus getItem(int position) {
+            return (downloadLog != null) ? downloadLog.get(position) : null;
+        }
+    };
+
+    private EventDistributor.EventListener contentUpdate = new EventDistributor.EventListener() {
+
+        @Override
+        public void update(EventDistributor eventDistributor, Integer arg) {
+            if ((arg & EventDistributor.DOWNLOADLOG_UPDATE) != 0) {
+                startItemLoader();
+            }
+        }
+    };
+
+    private ItemLoader itemLoader;
+
+    private void startItemLoader() {
+        if (itemLoader != null) {
+            itemLoader.cancel(true);
+        }
+        itemLoader = new ItemLoader();
+        itemLoader.execute();
+    }
+
+    private void stopItemLoader() {
+        if (itemLoader != null) {
+            itemLoader.cancel(true);
+        }
+    }
+
+    private class ItemLoader extends AsyncTask<Void, Void, List<DownloadStatus>> {
+
+        @Override
+        protected void onPostExecute(List<DownloadStatus> downloadStatuses) {
+            super.onPostExecute(downloadStatuses);
+            if (downloadStatuses != null) {
+                downloadLog = downloadStatuses;
+                itemsLoaded = true;
+                if (viewsCreated) {
+                    onFragmentLoaded();
+                }
+            }
+        }
+
+        @Override
+        protected List<DownloadStatus> doInBackground(Void... params) {
+            Context context = getActivity();
+            if (context != null) {
+                return DBReader.getDownloadLog(context);
+            }
+            return null;
+        }
+    }
+}
diff --git a/src/de/danoeh/antennapod/fragment/DownloadsFragment.java b/src/de/danoeh/antennapod/fragment/DownloadsFragment.java
new file mode 100644
index 000000000..5a71cb36b
--- /dev/null
+++ b/src/de/danoeh/antennapod/fragment/DownloadsFragment.java
@@ -0,0 +1,145 @@
+package de.danoeh.antennapod.fragment;
+
+import android.app.Activity;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentPagerAdapter;
+import android.support.v4.app.FragmentTransaction;
+import android.support.v4.view.ViewPager;
+import android.support.v7.app.ActionBar;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.activity.MainActivity;
+
+/**
+ * Shows the CompletedDownloadsFragment and the RunningDownloadsFragment
+ */
+public class DownloadsFragment extends Fragment {
+
+    public static final String ARG_SELECTED_TAB = "selected_tab";
+
+    public static final int POS_RUNNING = 0;
+    public static final int POS_COMPLETED = 1;
+    public static final int POS_LOG = 2;
+
+    private ViewPager pager;
+    private MainActivity activity;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        super.onCreateView(inflater, container, savedInstanceState);
+        View root = inflater.inflate(R.layout.pager_fragment, container, false);
+        pager = (ViewPager) root.findViewById(R.id.pager);
+        DownloadsPagerAdapter pagerAdapter = new DownloadsPagerAdapter(getChildFragmentManager(), getResources());
+        pager.setAdapter(pagerAdapter);
+        final ActionBar actionBar = activity.getMainActivtyActionBar();
+        actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
+        ActionBar.TabListener tabListener = new ActionBar.TabListener() {
+            @Override
+            public void onTabSelected(ActionBar.Tab tab, FragmentTransaction fragmentTransaction) {
+                pager.setCurrentItem(tab.getPosition());
+            }
+
+            @Override
+            public void onTabUnselected(ActionBar.Tab tab, FragmentTransaction fragmentTransaction) {
+
+            }
+
+            @Override
+            public void onTabReselected(ActionBar.Tab tab, FragmentTransaction fragmentTransaction) {
+
+            }
+        };
+        actionBar.removeAllTabs();
+        actionBar.addTab(actionBar.newTab()
+                .setText(R.string.downloads_running_label)
+                .setTabListener(tabListener));
+        actionBar.addTab(actionBar.newTab()
+                .setText(R.string.downloads_completed_label)
+                .setTabListener(tabListener));
+        actionBar.addTab(actionBar.newTab()
+                .setText(R.string.downloads_log_label)
+                .setTabListener(tabListener));
+
+        pager.setOnPageChangeListener(new ViewPager.SimpleOnPageChangeListener() {
+            @Override
+            public void onPageSelected(int position) {
+                super.onPageSelected(position);
+                actionBar.setSelectedNavigationItem(position);
+            }
+        });
+        return root;
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        if (getArguments() != null) {
+            int tab = getArguments().getInt(ARG_SELECTED_TAB);
+            pager.setCurrentItem(tab, false);
+        }
+    }
+
+    @Override
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+        this.activity = (MainActivity) activity;
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        activity.getMainActivtyActionBar().removeAllTabs();
+        activity.getMainActivtyActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
+    }
+
+    public class DownloadsPagerAdapter extends FragmentPagerAdapter {
+
+
+
+
+        Resources resources;
+
+        public DownloadsPagerAdapter(FragmentManager fm, Resources resources) {
+            super(fm);
+            this.resources = resources;
+        }
+
+        @Override
+        public Fragment getItem(int position) {
+            switch (position) {
+                case POS_RUNNING:
+                    return new RunningDownloadsFragment();
+                case POS_COMPLETED:
+                    return new CompletedDownloadsFragment();
+                case POS_LOG:
+                    return new DownloadLogFragment();
+                default:
+                    return null;
+            }
+        }
+
+        @Override
+        public int getCount() {
+            return 3;
+        }
+
+        @Override
+        public CharSequence getPageTitle(int position) {
+            switch (position) {
+                case POS_RUNNING:
+                    return resources.getString(R.string.downloads_running_label);
+                case POS_COMPLETED:
+                    return resources.getString(R.string.downloads_completed_label);
+                case POS_LOG:
+                    return resources.getString(R.string.downloads_log_label);
+                default:
+                    return super.getPageTitle(position);
+            }
+        }
+    }
+}
diff --git a/src/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java b/src/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
index 47cd3f244..db47cd8a4 100644
--- a/src/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
+++ b/src/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
@@ -29,8 +29,6 @@ public class ExternalPlayerFragment extends Fragment {
 	private ImageView imgvCover;
 	private ViewGroup layoutInfo;
 	private TextView txtvTitle;
-	private TextView txtvPosition;
-	private TextView txtvStatus;
 	private ImageButton butPlay;
 
 	private PlaybackController controller;
@@ -48,9 +46,7 @@ public class ExternalPlayerFragment extends Fragment {
 		imgvCover = (ImageView) root.findViewById(R.id.imgvCover);
 		layoutInfo = (ViewGroup) root.findViewById(R.id.layoutInfo);
 		txtvTitle = (TextView) root.findViewById(R.id.txtvTitle);
-		txtvPosition = (TextView) root.findViewById(R.id.txtvPosition);
 		butPlay = (ImageButton) root.findViewById(R.id.butPlay);
-		txtvStatus = (TextView) root.findViewById(R.id.txtvStatus);
 
 		layoutInfo.setOnClickListener(new OnClickListener() {
 
@@ -84,12 +80,6 @@ public class ExternalPlayerFragment extends Fragment {
 
 			@Override
 			public void onPositionObserverUpdate() {
-				int duration = controller.getDuration();
-				int position = controller.getPosition();
-				if (duration != PlaybackController.INVALID_TIME
-						&& position != PlaybackController.INVALID_TIME) {
-					txtvPosition.setText(getPositionString(position, duration));
-				}
 			}
 
 			@Override
@@ -127,12 +117,10 @@ public class ExternalPlayerFragment extends Fragment {
 
 			@Override
 			public void postStatusMsg(int msg) {
-				txtvStatus.setText(msg);
 			}
 
 			@Override
 			public void clearStatusMsg() {
-				txtvStatus.setText("");
 			}
 
 			@Override
@@ -223,8 +211,6 @@ public class ExternalPlayerFragment extends Fragment {
 						(int) getActivity().getResources().getDimension(
 								R.dimen.external_player_height));
 
-				txtvPosition.setText(getPositionString(media.getPosition(),
-						media.getDuration()));
 				fragmentLayout.setVisibility(View.VISIBLE);
 				if (controller.isPlayingVideo()) {
 					butPlay.setVisibility(View.GONE);
diff --git a/src/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java b/src/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
index 48c544457..bf6974982 100644
--- a/src/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
+++ b/src/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
@@ -236,7 +236,7 @@ public class ItemDescriptionFragment extends Fragment {
      *                  value is inserted directly into the CSS String.
      */
     private String applyWebviewStyle(String textColor, String data) {
-        final String WEBVIEW_STYLE = "<html><head><style type=\"text/css\"> * { color: %s; font-family: Helvetica; line-height: 1.5em; font-size: 11pt; } a { font-style: normal; text-decoration: none; font-weight: normal; color: #00A8DF; } img { display: block; margin: 10 auto; max-width: %s; height: auto; } body { margin: %dpx %dpx %dpx %dpx; }</style></head><body>%s</body></html>";
+        final String WEBVIEW_STYLE = "<html><head><style type=\"text/css\"> @font-face { font-family: 'Roboto-Light'; src: url('file:///android_asset/Roboto-Light.ttf'); } * { color: %s; font-family: roboto-Light; font-size: 11pt; } a { font-style: normal; text-decoration: none; font-weight: normal; color: #00A8DF; } img { display: block; margin: 10 auto; max-width: %s; height: auto; } body { margin: %dpx %dpx %dpx %dpx; }</style></head><body>%s</body></html>";
         final int pageMargin = (int) TypedValue.applyDimension(
                 TypedValue.COMPLEX_UNIT_DIP, 8, getResources()
                 .getDisplayMetrics());
diff --git a/src/de/danoeh/antennapod/fragment/ItemlistFragment.java b/src/de/danoeh/antennapod/fragment/ItemlistFragment.java
index e5845dd76..5d0b1bec8 100644
--- a/src/de/danoeh/antennapod/fragment/ItemlistFragment.java
+++ b/src/de/danoeh/antennapod/fragment/ItemlistFragment.java
@@ -2,326 +2,437 @@ package de.danoeh.antennapod.fragment;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
+import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
+import android.os.Handler;
 import android.support.v4.app.ListFragment;
 import android.support.v7.app.ActionBarActivity;
+import android.support.v7.widget.SearchView;
 import android.util.Log;
 import android.view.*;
-import android.view.ContextMenu.ContextMenuInfo;
+import android.widget.ImageButton;
+import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
 import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.activity.ItemviewActivity;
-import de.danoeh.antennapod.adapter.ActionButtonCallback;
-import de.danoeh.antennapod.adapter.InternalFeedItemlistAdapter;
+import de.danoeh.antennapod.activity.FeedInfoActivity;
+import de.danoeh.antennapod.activity.MainActivity;
+import de.danoeh.antennapod.adapter.DefaultActionButtonCallback;
+import de.danoeh.antennapod.adapter.FeedItemlistAdapter;
+import de.danoeh.antennapod.asynctask.DownloadObserver;
+import de.danoeh.antennapod.asynctask.FeedRemover;
+import de.danoeh.antennapod.asynctask.ImageLoader;
+import de.danoeh.antennapod.dialog.ConfirmationDialog;
 import de.danoeh.antennapod.dialog.DownloadRequestErrorDialogCreator;
+import de.danoeh.antennapod.dialog.FeedItemDialog;
 import de.danoeh.antennapod.feed.EventDistributor;
 import de.danoeh.antennapod.feed.Feed;
 import de.danoeh.antennapod.feed.FeedItem;
+import de.danoeh.antennapod.feed.FeedMedia;
 import de.danoeh.antennapod.service.download.DownloadService;
+import de.danoeh.antennapod.service.download.Downloader;
 import de.danoeh.antennapod.storage.DBReader;
 import de.danoeh.antennapod.storage.DownloadRequestException;
 import de.danoeh.antennapod.storage.DownloadRequester;
 import de.danoeh.antennapod.util.QueueAccess;
-import de.danoeh.antennapod.util.menuhandler.FeedItemMenuHandler;
+import de.danoeh.antennapod.util.menuhandler.FeedMenuHandler;
+import de.danoeh.antennapod.util.menuhandler.MenuItemUtils;
 
 import java.util.List;
 
-/** Displays a list of FeedItems. */
+/**
+ * Displays a list of FeedItems.
+ */
 @SuppressLint("ValidFragment")
 public class ItemlistFragment extends ListFragment {
-	private static final String TAG = "ItemlistFragment";
-
-	private static final int EVENTS = EventDistributor.DOWNLOAD_HANDLED
-			| EventDistributor.DOWNLOAD_QUEUED
-			| EventDistributor.QUEUE_UPDATE
-			| EventDistributor.UNREAD_ITEMS_UPDATE;
-
-	public static final String EXTRA_SELECTED_FEEDITEM = "extra.de.danoeh.antennapod.activity.selected_feeditem";
-	public static final String ARGUMENT_FEED_ID = "argument.de.danoeh.antennapod.feed_id";
-	protected InternalFeedItemlistAdapter fila;
-
-	private Feed feed;
-    protected List<Long> queue;
-
-	protected FeedItem selectedItem = null;
-	protected boolean contextMenuClosed = true;
-
-	/** Argument for FeeditemlistAdapter */
-	protected boolean showFeedtitle;
-
-    private AsyncTask<Long, Void, Feed> currentLoadTask;
-
-	public ItemlistFragment(boolean showFeedtitle) {
-		super();
-		this.showFeedtitle = showFeedtitle;
-	}
-
-	public ItemlistFragment() {
-	}
-
-	/**
-	 * Creates new ItemlistFragment which shows the Feeditems of a specific
-	 * feed. Sets 'showFeedtitle' to false
-	 * 
-	 * @param feedId
-	 *            The id of the feed to show
-	 * @return the newly created instance of an ItemlistFragment
-	 */
-	public static ItemlistFragment newInstance(long feedId) {
-		ItemlistFragment i = new ItemlistFragment();
-		i.showFeedtitle = false;
-		Bundle b = new Bundle();
-		b.putLong(ARGUMENT_FEED_ID, feedId);
-		i.setArguments(b);
-		return i;
-	}
-
-    private InternalFeedItemlistAdapter.ItemAccess itemAccessRef;
-    protected InternalFeedItemlistAdapter.ItemAccess itemAccess() {
-        if (itemAccessRef == null) {
-            itemAccessRef = new InternalFeedItemlistAdapter.ItemAccess() {
+    private static final String TAG = "ItemlistFragment";
 
-                @Override
-                public FeedItem getItem(int position) {
-                    return (feed != null) ? feed.getItemAtIndex(true, position) : null;
-                }
+    private static final int EVENTS = EventDistributor.DOWNLOAD_HANDLED
+            | EventDistributor.DOWNLOAD_QUEUED
+            | EventDistributor.QUEUE_UPDATE
+            | EventDistributor.UNREAD_ITEMS_UPDATE;
 
-                @Override
-                public int getCount() {
-                    return (feed != null) ? feed.getNumOfItems(true) : 0;
-                }
+    public static final String EXTRA_SELECTED_FEEDITEM = "extra.de.danoeh.antennapod.activity.selected_feeditem";
+    public static final String ARGUMENT_FEED_ID = "argument.de.danoeh.antennapod.feed_id";
 
-                @Override
-                public boolean isInQueue(FeedItem item) {
-                    return (queue != null) && queue.contains(item.getId());
-                }
-            };
-        }
-        return itemAccessRef;
+    protected FeedItemlistAdapter adapter;
+
+    private long feedID;
+    private Feed feed;
+    protected QueueAccess queue;
+
+    private boolean itemsLoaded = false;
+    private boolean viewsCreated = false;
+
+    private DownloadObserver downloadObserver;
+    private List<Downloader> downloaderList;
+
+    private FeedItemDialog feedItemDialog;
+    private FeedItemDialog.FeedItemDialogSavedInstance feedItemDialogSavedInstance;
+
+
+    /**
+     * Creates new ItemlistFragment which shows the Feeditems of a specific
+     * feed. Sets 'showFeedtitle' to false
+     *
+     * @param feedId The id of the feed to show
+     * @return the newly created instance of an ItemlistFragment
+     */
+    public static ItemlistFragment newInstance(long feedId) {
+        ItemlistFragment i = new ItemlistFragment();
+        Bundle b = new Bundle();
+        b.putLong(ARGUMENT_FEED_ID, feedId);
+        i.setArguments(b);
+        return i;
     }
 
-	@Override
-	public View onCreateView(LayoutInflater inflater, ViewGroup container,
-			Bundle savedInstanceState) {
-		return inflater.inflate(R.layout.feeditemlist, container, false);
-	}
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setRetainInstance(true);
+        setHasOptionsMenu(true);
+
+        Bundle args = getArguments();
+        if (args == null) throw new IllegalArgumentException("args invalid");
+        feedID = args.getLong(ARGUMENT_FEED_ID);
+    }
 
     @Override
     public void onStart() {
         super.onStart();
         EventDistributor.getInstance().register(contentUpdate);
-        loadData();
+        if (downloadObserver != null) {
+            downloadObserver.setActivity(getActivity());
+            downloadObserver.onResume();
+        }
+        if (viewsCreated && itemsLoaded) {
+            onFragmentLoaded();
+        }
     }
 
     @Override
     public void onStop() {
         super.onStop();
         EventDistributor.getInstance().unregister(contentUpdate);
-        if (currentLoadTask != null) {
-            currentLoadTask.cancel(true);
-        }
+        stopItemLoader();
     }
 
-    protected synchronized void loadData() {
-        final long feedId;
-        if (feed == null) {
-            feedId = getArguments().getLong(ARGUMENT_FEED_ID);
-        } else {
-            feedId = feed.getId();
+    @Override
+    public void onResume() {
+        super.onResume();
+        updateProgressBarVisibility();
+        startItemLoader();
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        stopItemLoader();
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        resetViewState();
+    }
+
+    private void resetViewState() {
+        adapter = null;
+        viewsCreated = false;
+        if (downloadObserver != null) {
+            downloadObserver.onPause();
         }
-        if (currentLoadTask != null) {
-            currentLoadTask.cancel(true);
+        if (feedItemDialog != null) {
+            feedItemDialogSavedInstance = feedItemDialog.save();
         }
-        AsyncTask<Long, Void, Feed> loadTask = new AsyncTask<Long, Void, Feed>(){
-            private volatile List<Long> queueRef;
+        feedItemDialog = null;
+    }
 
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        FeedMenuHandler.onCreateOptionsMenu(inflater, menu);
+
+        final SearchView sv = new SearchView(getActivity());
+        MenuItemUtils.addSearchItem(menu, sv);
+        sv.setQueryHint(getString(R.string.search_hint));
+        sv.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
             @Override
-            protected Feed doInBackground(Long... longs) {
-                Context context = ItemlistFragment.this.getActivity();
-                if (context != null) {
-                    Feed result = DBReader.getFeed(context, longs[0]);
-                    if (result != null) {
-                        result.setItems(DBReader.getFeedItemList(context, result));
-                        queueRef = DBReader.getQueueIDList(context);
-                        return result;
-                    }
+            public boolean onQueryTextSubmit(String s) {
+                sv.clearFocus();
+                if (itemsLoaded) {
+                    ((MainActivity) getActivity()).loadChildFragment(SearchFragment.newInstance(s, feed.getId()));
                 }
-                return null;
+                return true;
             }
 
             @Override
-            protected void onPostExecute(Feed result) {
-                super.onPostExecute(result);
-                if (result != null && result.getItems() != null) {
-                    feed = result;
-                    if (queueRef != null) {
-                        queue = queueRef;
-                    } else {
-                        Log.e(TAG, "Could not load queue");
-                    }
-                    setEmptyViewIfListIsEmpty();
-                    if (fila != null) {
-                        fila.notifyDataSetChanged();
+            public boolean onQueryTextChange(String s) {
+                return false;
+            }
+        });
+    }
+
+    @Override
+    public void onPrepareOptionsMenu(Menu menu) {
+        FeedMenuHandler.onPrepareOptionsMenu(menu, feed);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (!super.onOptionsItemSelected(item)) {
+            try {
+                if (!FeedMenuHandler.onOptionsItemClicked(getActivity(), item, feed)) {
+                    switch (item.getItemId()) {
+                        case R.id.remove_item:
+                            final FeedRemover remover = new FeedRemover(
+                                    getActivity(), feed) {
+                                @Override
+                                protected void onPostExecute(Void result) {
+                                    super.onPostExecute(result);
+                                    ((MainActivity) getActivity()).loadNavFragment(MainActivity.POS_NEW, null);
+                                }
+                            };
+                            ConfirmationDialog conDialog = new ConfirmationDialog(getActivity(),
+                                    R.string.remove_feed_label,
+                                    R.string.feed_delete_confirmation_msg) {
+
+                                @Override
+                                public void onConfirmButtonPressed(
+                                        DialogInterface dialog) {
+                                    dialog.dismiss();
+                                    remover.executeAsync();
+                                }
+                            };
+                            conDialog.createNewDialog().show();
+                            return true;
+                        default:
+                            return false;
+
                     }
                 } else {
-                    if (result == null) {
-                        Log.e(TAG, "Could not load feed with id " + feedId);
-                    } else if (result.getItems() == null) {
-                        Log.e(TAG, "Could not load feed items");
-                    }
+                    return true;
                 }
+            } catch (DownloadRequestException e) {
+                e.printStackTrace();
+                DownloadRequestErrorDialogCreator.newRequestErrorDialog(getActivity(), e.getMessage());
+                return true;
             }
-        };
-        currentLoadTask = loadTask;
-        loadTask.execute(feedId);
+        } else {
+            return true;
+        }
+
     }
 
-    private void setEmptyViewIfListIsEmpty() {
-        if (getListView() != null && feed != null && feed.getItems() != null) {
-            if (feed.getItems().isEmpty()) {
-                ((TextView) getActivity().findViewById(android.R.id.empty)).setText(R.string.no_items_label);
-            }
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        ((ActionBarActivity) getActivity()).getSupportActionBar().setTitle("");
+
+        viewsCreated = true;
+        if (itemsLoaded) {
+            onFragmentLoaded();
         }
     }
 
-	protected InternalFeedItemlistAdapter createListAdapter() {
-		return new InternalFeedItemlistAdapter(getActivity(), itemAccess(),
-				adapterCallback, showFeedtitle);
-	}
-
-	@Override
-	public void onResume() {
-		super.onResume();
-		getActivity().runOnUiThread(new Runnable() {
-
-			@Override
-			public void run() {
-				fila.notifyDataSetChanged();
-			}
-		});
-		updateProgressBarVisibility();
-	}
-
-	@Override
-	public void onListItemClick(ListView l, View v, int position, long id) {
-		FeedItem selection = fila.getItem(position - l.getHeaderViewsCount());
-		Intent showItem = new Intent(getActivity(), ItemviewActivity.class);
-		showItem.putExtra(FeedlistFragment.EXTRA_SELECTED_FEED, selection
-				.getFeed().getId());
-		showItem.putExtra(EXTRA_SELECTED_FEEDITEM, selection.getId());
-
-		startActivity(showItem);
-	}
-
-	private EventDistributor.EventListener contentUpdate = new EventDistributor.EventListener() {
-
-		@Override
-		public void update(EventDistributor eventDistributor, Integer arg) {
-			if ((EVENTS & arg) != 0) {
-				if (BuildConfig.DEBUG)
-					Log.d(TAG, "Received contentUpdate Intent.");
-				if ((EventDistributor.DOWNLOAD_QUEUED & arg) != 0) {
-					updateProgressBarVisibility();
-				} else {
-                    if (feed != null) {
-                        loadData();
-                    }
-					updateProgressBarVisibility();
-				}
-			}
-		}
-	};
-
-	private void updateProgressBarVisibility() {
-		if (feed != null) {
-			if (DownloadService.isRunning
-					&& DownloadRequester.getInstance().isDownloadingFile(feed)) {
+    @Override
+    public void onListItemClick(ListView l, View v, int position, long id) {
+        FeedItem selection = adapter.getItem(position - l.getHeaderViewsCount());
+        feedItemDialog = FeedItemDialog.newInstance(getActivity(), selection, queue);
+        feedItemDialog.show();
+    }
+
+    private EventDistributor.EventListener contentUpdate = new EventDistributor.EventListener() {
+
+        @Override
+        public void update(EventDistributor eventDistributor, Integer arg) {
+            if ((EVENTS & arg) != 0) {
+                if (BuildConfig.DEBUG)
+                    Log.d(TAG, "Received contentUpdate Intent.");
+                if ((EventDistributor.DOWNLOAD_QUEUED & arg) != 0) {
+                    updateProgressBarVisibility();
+                } else {
+                    startItemLoader();
+                    updateProgressBarVisibility();
+                }
+            }
+        }
+    };
+
+    private void updateProgressBarVisibility() {
+        if (feed != null) {
+            if (DownloadService.isRunning
+                    && DownloadRequester.getInstance().isDownloadingFile(feed)) {
                 ((ActionBarActivity) getActivity())
-						.setSupportProgressBarIndeterminateVisibility(true);
-			} else {
+                        .setSupportProgressBarIndeterminateVisibility(true);
+            } else {
                 ((ActionBarActivity) getActivity())
-						.setSupportProgressBarIndeterminateVisibility(false);
-			}
+                        .setSupportProgressBarIndeterminateVisibility(false);
+            }
             getActivity().supportInvalidateOptionsMenu();
-		}
-	}
-
-	protected ActionButtonCallback adapterCallback = new ActionButtonCallback() {
-
-		@Override
-		public void onActionButtonPressed(FeedItem item) {
-			selectedItem = item;
-			contextMenuClosed = true;
-			getListView().showContextMenu();
-		}
-	};
-
-	@Override
-	public void onViewCreated(View view, Bundle savedInstanceState) {
-		fila = createListAdapter();
-		setListAdapter(fila);
-		this.getListView().setItemsCanFocus(true);
-		getListView().setChoiceMode(ListView.CHOICE_MODE_SINGLE);
-		registerForContextMenu(getListView());
-		getListView().setOnItemLongClickListener(null);
-	}
-
-	@Override
-	public void onCreateContextMenu(final ContextMenu menu, View v,
-			ContextMenuInfo menuInfo) {
-		super.onCreateContextMenu(menu, v, menuInfo);
-		if (!contextMenuClosed) { // true if context menu was cancelled before
-			selectedItem = null;
-		}
-		contextMenuClosed = false;
-		getListView().setOnItemLongClickListener(null);
-		if (selectedItem != null) {
-			new MenuInflater(ItemlistFragment.this.getActivity()).inflate(
-					R.menu.feeditem, menu);
-
-			menu.setHeaderTitle(selectedItem.getTitle());
-			FeedItemMenuHandler.onPrepareMenu(
-                    new FeedItemMenuHandler.MenuInterface() {
-
-                        @Override
-                        public void setItemVisibility(int id, boolean visible) {
-                            menu.findItem(id).setVisible(visible);
-                        }
-                    }, selectedItem, false, QueueAccess.IDListAccess(queue));
-
-		}
-	}
-
-	@Override
-	public boolean onContextItemSelected(android.view.MenuItem item) {
-		boolean handled = false;
-
-		if (selectedItem != null) {
-
-			try {
-				handled = FeedItemMenuHandler.onMenuItemClicked(
-						getActivity(), item.getItemId(), selectedItem);
-			} catch (DownloadRequestException e) {
-				e.printStackTrace();
-				DownloadRequestErrorDialogCreator.newRequestErrorDialog(
-						getActivity(), e.getMessage());
-			}
-			if (handled) {
-				fila.notifyDataSetChanged();
-			}
-
-		}
-		selectedItem = null;
-		contextMenuClosed = true;
-		return handled;
-	}
-
-	public InternalFeedItemlistAdapter getListAdapter() {
-		return fila;
-	}
+        }
+    }
+
+    private void onFragmentLoaded() {
+        if (adapter == null) {
+            getListView().setAdapter(null);
+            setupHeaderView();
+            adapter = new FeedItemlistAdapter(getActivity(), itemAccess, new DefaultActionButtonCallback(getActivity()), false);
+            setListAdapter(adapter);
+            downloadObserver = new DownloadObserver(getActivity(), new Handler(), downloadObserverCallback);
+            downloadObserver.onResume();
+        }
+        setListShown(true);
+        adapter.notifyDataSetChanged();
+
+        if (feedItemDialog != null) {
+            feedItemDialog.updateContent(queue, feed.getItems());
+        } else if (feedItemDialogSavedInstance != null) {
+            feedItemDialog = FeedItemDialog.newInstance(getActivity(), feedItemDialogSavedInstance);
+        }
+        getActivity().supportInvalidateOptionsMenu();
+    }
+
+    private DownloadObserver.Callback downloadObserverCallback = new DownloadObserver.Callback() {
+        @Override
+        public void onContentChanged() {
+            if (adapter != null) {
+                adapter.notifyDataSetChanged();
+            }
+            if (feedItemDialog != null && feedItemDialog.isShowing()) {
+                feedItemDialog.updateMenuAppearance();
+            }
+        }
+
+        @Override
+        public void onDownloadDataAvailable(List<Downloader> downloaderList) {
+            ItemlistFragment.this.downloaderList = downloaderList;
+            if (adapter != null) {
+                adapter.notifyDataSetChanged();
+            }
+        }
+    };
+
+    private void setupHeaderView() {
+        if (getListView() == null || feed == null) {
+            Log.e(TAG, "Unable to setup listview: listView = null or feed = null");
+            return;
+        }
+        LayoutInflater inflater = (LayoutInflater)
+                getActivity().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        View header = inflater.inflate(R.layout.feeditemlist_header, null);
+        getListView().addHeaderView(header);
+
+        TextView txtvTitle = (TextView) header.findViewById(R.id.txtvTitle);
+        TextView txtvAuthor = (TextView) header.findViewById(R.id.txtvAuthor);
+        ImageView imgvCover = (ImageView) header.findViewById(R.id.imgvCover);
+        ImageButton butShowInfo = (ImageButton) header.findViewById(R.id.butShowInfo);
+        ImageButton butVisitWebsite = (ImageButton) header.findViewById(R.id.butVisitWebsite);
+
+        txtvTitle.setText(feed.getTitle());
+        txtvAuthor.setText(feed.getAuthor());
+        ImageLoader.getInstance().loadThumbnailBitmap(feed.getImage(), imgvCover,
+                (int) getResources().getDimension(R.dimen.thumbnail_length_onlinefeedview));
+        if (feed.getLink() == null) {
+            butVisitWebsite.setVisibility(View.INVISIBLE);
+        } else {
+            butVisitWebsite.setVisibility(View.VISIBLE);
+            butVisitWebsite.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    Uri uri = Uri.parse(feed.getLink());
+                    startActivity(new Intent(Intent.ACTION_VIEW, uri));
+                }
+            });
+        }
+        butShowInfo.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (viewsCreated && itemsLoaded) {
+                    Intent startIntent = new Intent(getActivity(), FeedInfoActivity.class);
+                    startIntent.putExtra(FeedInfoActivity.EXTRA_FEED_ID,
+                            feed.getId());
+                    startActivity(startIntent);
+                }
+            }
+        });
+    }
 
+    private FeedItemlistAdapter.ItemAccess itemAccess = new FeedItemlistAdapter.ItemAccess() {
+
+        @Override
+        public FeedItem getItem(int position) {
+            return (feed != null) ? feed.getItemAtIndex(true, position) : null;
+        }
+
+        @Override
+        public int getCount() {
+            return (feed != null) ? feed.getNumOfItems(true) : 0;
+        }
+
+        @Override
+        public boolean isInQueue(FeedItem item) {
+            return (queue != null) && queue.contains(item.getId());
+        }
+
+        @Override
+        public int getItemDownloadProgressPercent(FeedItem item) {
+            if (downloaderList != null) {
+                for (Downloader downloader : downloaderList) {
+                    if (downloader.getDownloadRequest().getFeedfileType() == FeedMedia.FEEDFILETYPE_FEEDMEDIA
+                            && downloader.getDownloadRequest().getFeedfileId() == item.getMedia().getId()) {
+                        return downloader.getDownloadRequest().getProgressPercent();
+                    }
+                }
+            }
+            return 0;
+        }
+    };
+
+    private ItemLoader itemLoader;
+
+    private void startItemLoader() {
+        if (itemLoader != null) {
+            itemLoader.cancel(true);
+        }
+        itemLoader = new ItemLoader();
+        itemLoader.execute(feedID);
+    }
+
+    private void stopItemLoader() {
+        if (itemLoader != null) {
+            itemLoader.cancel(true);
+        }
+    }
+
+    private class ItemLoader extends AsyncTask<Long, Void, Object[]> {
+        @Override
+        protected Object[] doInBackground(Long... params) {
+            long feedID = params[0];
+            Context context = getActivity();
+            if (context != null) {
+                return new Object[]{DBReader.getFeed(context, feedID),
+                        QueueAccess.IDListAccess(DBReader.getQueueIDList(context))};
+            } else {
+                return null;
+            }
+        }
+
+        @Override
+        protected void onPostExecute(Object[] res) {
+            super.onPostExecute(res);
+            if (res != null) {
+                feed = (Feed) res[0];
+                queue = (QueueAccess) res[1];
+                itemsLoaded = true;
+                if (viewsCreated) {
+                    onFragmentLoaded();
+                }
+            }
+        }
+    }
 }
diff --git a/src/de/danoeh/antennapod/fragment/NewEpisodesFragment.java b/src/de/danoeh/antennapod/fragment/NewEpisodesFragment.java
new file mode 100644
index 000000000..0c42bdd65
--- /dev/null
+++ b/src/de/danoeh/antennapod/fragment/NewEpisodesFragment.java
@@ -0,0 +1,442 @@
+package de.danoeh.antennapod.fragment;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.Handler;
+import android.support.v4.app.Fragment;
+import android.support.v4.widget.SwipeRefreshLayout;
+import android.support.v7.app.ActionBarActivity;
+import android.support.v7.widget.SearchView;
+import android.view.*;
+import android.widget.AdapterView;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+import android.widget.Toast;
+import com.mobeta.android.dslv.DragSortListView;
+import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.activity.MainActivity;
+import de.danoeh.antennapod.adapter.DefaultActionButtonCallback;
+import de.danoeh.antennapod.adapter.NewEpisodesListAdapter;
+import de.danoeh.antennapod.asynctask.DownloadObserver;
+import de.danoeh.antennapod.dialog.FeedItemDialog;
+import de.danoeh.antennapod.feed.EventDistributor;
+import de.danoeh.antennapod.feed.Feed;
+import de.danoeh.antennapod.feed.FeedItem;
+import de.danoeh.antennapod.feed.FeedMedia;
+import de.danoeh.antennapod.preferences.UserPreferences;
+import de.danoeh.antennapod.service.download.DownloadService;
+import de.danoeh.antennapod.service.download.Downloader;
+import de.danoeh.antennapod.storage.DBReader;
+import de.danoeh.antennapod.storage.DBTasks;
+import de.danoeh.antennapod.storage.DBWriter;
+import de.danoeh.antennapod.storage.DownloadRequester;
+import de.danoeh.antennapod.util.QueueAccess;
+import de.danoeh.antennapod.util.menuhandler.MenuItemUtils;
+
+import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
+
+/**
+ * Shows unread or recently published episodes
+ */
+public class NewEpisodesFragment extends Fragment {
+    private static final String TAG = "NewEpisodesFragment";
+    private static final int EVENTS = EventDistributor.DOWNLOAD_HANDLED |
+            EventDistributor.DOWNLOAD_QUEUED |
+            EventDistributor.QUEUE_UPDATE |
+            EventDistributor.UNREAD_ITEMS_UPDATE;
+
+    private static final int RECENT_EPISODES_LIMIT = 150;
+    private static final String PREF_NAME = "PrefNewEpisodesFragment";
+    private static final String PREF_EPISODE_FILTER_BOOL = "newEpisodeFilterEnabled";
+
+
+    private DragSortListView listView;
+    private SwipeRefreshLayout swipeRefreshLayout;
+    private NewEpisodesListAdapter listAdapter;
+    private TextView txtvEmpty;
+    private ProgressBar progLoading;
+
+    private List<FeedItem> unreadItems;
+    private List<FeedItem> recentItems;
+    private QueueAccess queueAccess;
+    private List<Downloader> downloaderList;
+
+    private boolean itemsLoaded = false;
+    private boolean viewsCreated = false;
+    private boolean showOnlyNewEpisodes = false;
+
+    private AtomicReference<MainActivity> activity = new AtomicReference<MainActivity>();
+
+    private DownloadObserver downloadObserver = null;
+
+    private FeedItemDialog feedItemDialog;
+    private FeedItemDialog.FeedItemDialogSavedInstance feedItemDialogSavedInstance;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setRetainInstance(true);
+        setHasOptionsMenu(true);
+
+        updateShowOnlyEpisodes();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        startItemLoader();
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        EventDistributor.getInstance().register(contentUpdate);
+        this.activity.set((MainActivity) getActivity());
+        if (downloadObserver != null) {
+            downloadObserver.setActivity(getActivity());
+            downloadObserver.onResume();
+        }
+        if (viewsCreated && itemsLoaded) {
+            onFragmentLoaded();
+        }
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        EventDistributor.getInstance().unregister(contentUpdate);
+        stopItemLoader();
+    }
+
+    @Override
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+        this.activity.set((MainActivity) getActivity());
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        resetViewState();
+    }
+
+    private void resetViewState() {
+        listAdapter = null;
+        activity.set(null);
+        viewsCreated = false;
+        if (downloadObserver != null) {
+            downloadObserver.onPause();
+        }
+        if (feedItemDialog != null) {
+            feedItemDialogSavedInstance = feedItemDialog.save();
+        }
+        feedItemDialog = null;
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        inflater.inflate(R.menu.new_episodes, menu);
+
+        final SearchView sv = new SearchView(getActivity());
+        MenuItemUtils.addSearchItem(menu, sv);
+        sv.setQueryHint(getString(R.string.search_hint));
+        sv.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+            @Override
+            public boolean onQueryTextSubmit(String s) {
+                sv.clearFocus();
+                ((MainActivity) getActivity()).loadChildFragment(SearchFragment.newInstance(s));
+                return true;
+            }
+
+            @Override
+            public boolean onQueryTextChange(String s) {
+                return false;
+            }
+        });
+    }
+
+    @Override
+    public void onPrepareOptionsMenu(Menu menu) {
+        super.onPrepareOptionsMenu(menu);
+        menu.findItem(R.id.mark_all_read_item).setVisible(unreadItems != null && !unreadItems.isEmpty());
+        menu.findItem(R.id.episode_filter_item).setChecked(showOnlyNewEpisodes);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (!super.onOptionsItemSelected(item)) {
+            switch (item.getItemId()) {
+                case R.id.refresh_item:
+                    List<Feed> feeds = ((MainActivity) getActivity()).getFeeds();
+                    if (feeds != null) {
+                        DBTasks.refreshAllFeeds(getActivity(), feeds);
+                    }
+                    return true;
+                case R.id.mark_all_read_item:
+                    DBWriter.markAllItemsRead(getActivity());
+                    Toast.makeText(getActivity(), R.string.mark_all_read_msg, Toast.LENGTH_SHORT).show();
+                    return true;
+                case R.id.episode_filter_item:
+                    boolean newVal = !item.isChecked();
+                    setShowOnlyNewEpisodes(newVal);
+                    item.setChecked(newVal);
+                    return true;
+                default:
+                    return false;
+            }
+        } else {
+            return true;
+        }
+
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        super.onCreateView(inflater, container, savedInstanceState);
+        ((MainActivity) getActivity()).getSupportActionBar().setTitle(R.string.all_episodes_label);
+
+        View root = inflater.inflate(R.layout.new_episodes_fragment, container, false);
+
+        swipeRefreshLayout = (SwipeRefreshLayout) root.findViewById(R.id.swipeRefreshLayout);
+        listView = (DragSortListView) root.findViewById(android.R.id.list);
+        txtvEmpty = (TextView) root.findViewById(android.R.id.empty);
+        progLoading = (ProgressBar) root.findViewById(R.id.progLoading);
+
+        listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                FeedItem item = (FeedItem) listAdapter.getItem(position - listView.getHeaderViewsCount());
+                if (item != null) {
+                    feedItemDialog = FeedItemDialog.newInstance(activity.get(), item, queueAccess);
+                    feedItemDialog.show();
+                }
+
+            }
+        });
+
+        final int secondColor = (UserPreferences.getTheme() == R.style.Theme_AntennaPod_Dark) ? R.color.swipe_refresh_secondary_color_dark : R.color.swipe_refresh_secondary_color_light;
+        swipeRefreshLayout.setColorScheme(R.color.bright_blue, secondColor, R.color.bright_blue, secondColor);
+        swipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
+            @Override
+            public void onRefresh() {
+                List<Feed> feeds = ((MainActivity) getActivity()).getFeeds();
+                if (feeds != null) {
+                    DBTasks.refreshAllFeeds(getActivity(), feeds);
+                }
+            }
+        });
+
+        if (!itemsLoaded) {
+            progLoading.setVisibility(View.VISIBLE);
+            txtvEmpty.setVisibility(View.GONE);
+        }
+
+        viewsCreated = true;
+
+        if (itemsLoaded && activity.get() != null) {
+            onFragmentLoaded();
+        }
+
+        return root;
+    }
+
+    private void onFragmentLoaded() {
+        if (listAdapter == null) {
+            listAdapter = new NewEpisodesListAdapter(activity.get(), itemAccess, new DefaultActionButtonCallback(activity.get()));
+            listView.setAdapter(listAdapter);
+            listView.setEmptyView(txtvEmpty);
+            downloadObserver = new DownloadObserver(activity.get(), new Handler(), downloadObserverCallback);
+            downloadObserver.onResume();
+        }
+        if (feedItemDialog != null) {
+            feedItemDialog.updateContent(queueAccess, unreadItems, recentItems);
+        } else if (feedItemDialogSavedInstance != null) {
+            feedItemDialog = FeedItemDialog.newInstance(activity.get(), feedItemDialogSavedInstance);
+        }
+        listAdapter.notifyDataSetChanged();
+        getActivity().supportInvalidateOptionsMenu();
+        updateProgressBarVisibility();
+        updateShowOnlyEpisodesListViewState();
+    }
+
+    private DownloadObserver.Callback downloadObserverCallback = new DownloadObserver.Callback() {
+        @Override
+        public void onContentChanged() {
+            if (listAdapter != null) {
+                listAdapter.notifyDataSetChanged();
+            }
+            if (feedItemDialog != null && feedItemDialog.isShowing()) {
+                feedItemDialog.updateMenuAppearance();
+            }
+        }
+
+        @Override
+        public void onDownloadDataAvailable(List<Downloader> downloaderList) {
+            NewEpisodesFragment.this.downloaderList = downloaderList;
+            if (listAdapter != null) {
+                listAdapter.notifyDataSetChanged();
+            }
+        }
+    };
+
+    private NewEpisodesListAdapter.ItemAccess itemAccess = new NewEpisodesListAdapter.ItemAccess() {
+
+        @Override
+        public int getCount() {
+            if (itemsLoaded) {
+                return (showOnlyNewEpisodes) ? unreadItems.size() : recentItems.size();
+            }
+            return 0;
+        }
+
+        @Override
+        public FeedItem getItem(int position) {
+            if (itemsLoaded) {
+                return (showOnlyNewEpisodes) ? unreadItems.get(position) : recentItems.get(position);
+            }
+            return null;
+        }
+
+        @Override
+        public int getItemDownloadProgressPercent(FeedItem item) {
+            if (downloaderList != null) {
+                for (Downloader downloader : downloaderList) {
+                    if (downloader.getDownloadRequest().getFeedfileType() == FeedMedia.FEEDFILETYPE_FEEDMEDIA
+                            && downloader.getDownloadRequest().getFeedfileId() == item.getMedia().getId()) {
+                        return downloader.getDownloadRequest().getProgressPercent();
+                    }
+                }
+            }
+            return 0;
+        }
+
+        @Override
+        public boolean isInQueue(FeedItem item) {
+            if (itemsLoaded) {
+                return queueAccess.contains(item.getId());
+            } else {
+                return false;
+            }
+        }
+
+
+    };
+
+    private void updateProgressBarVisibility() {
+        if (!viewsCreated) {
+            return;
+        }
+
+        if (DownloadService.isRunning
+                && DownloadRequester.getInstance().isDownloadingFeeds()) {
+            swipeRefreshLayout.setRefreshing(true);
+
+        } else {
+            swipeRefreshLayout.setRefreshing(false);
+
+            // if case other fragments have set this to true, this fragment should remove the progress indicator
+            ((ActionBarActivity) getActivity())
+                    .setSupportProgressBarIndeterminateVisibility(false);
+        }
+    }
+
+    private EventDistributor.EventListener contentUpdate = new EventDistributor.EventListener() {
+        @Override
+        public void update(EventDistributor eventDistributor, Integer arg) {
+            if ((arg & EVENTS) != 0) {
+                startItemLoader();
+                updateProgressBarVisibility();
+            }
+        }
+    };
+
+    private void updateShowOnlyEpisodes() {
+        SharedPreferences prefs = getActivity().getSharedPreferences(PREF_NAME, Context.MODE_PRIVATE);
+        showOnlyNewEpisodes = prefs.getBoolean(PREF_EPISODE_FILTER_BOOL, false);
+    }
+
+    private void setShowOnlyNewEpisodes(boolean newVal) {
+        showOnlyNewEpisodes = newVal;
+        SharedPreferences prefs = getActivity().getSharedPreferences(PREF_NAME, Context.MODE_PRIVATE);
+        SharedPreferences.Editor editor = prefs.edit();
+        editor.putBoolean(PREF_EPISODE_FILTER_BOOL, showOnlyNewEpisodes);
+        editor.commit();
+        if (itemsLoaded && viewsCreated) {
+            listAdapter.notifyDataSetChanged();
+            activity.get().supportInvalidateOptionsMenu();
+            updateShowOnlyEpisodesListViewState();
+        }
+    }
+
+    private void updateShowOnlyEpisodesListViewState() {
+        if (showOnlyNewEpisodes) {
+            listView.setEmptyView(null);
+            txtvEmpty.setVisibility(View.GONE);
+        } else {
+            listView.setEmptyView(txtvEmpty);
+        }
+    }
+
+    private ItemLoader itemLoader;
+
+    private void startItemLoader() {
+        if (itemLoader != null) {
+            itemLoader.cancel(true);
+        }
+        itemLoader = new ItemLoader();
+        itemLoader.execute();
+    }
+
+    private void stopItemLoader() {
+        if (itemLoader != null) {
+            itemLoader.cancel(true);
+        }
+    }
+
+    private class ItemLoader extends AsyncTask<Void, Void, Object[]> {
+
+        @Override
+        protected void onPreExecute() {
+            super.onPreExecute();
+            if (viewsCreated && !itemsLoaded) {
+                listView.setVisibility(View.GONE);
+                txtvEmpty.setVisibility(View.GONE);
+                progLoading.setVisibility(View.VISIBLE);
+            }
+        }
+
+        @Override
+        protected Object[] doInBackground(Void... params) {
+            Context context = activity.get();
+            if (context != null) {
+                return new Object[]{DBReader.getUnreadItemsList(context),
+                        DBReader.getRecentlyPublishedEpisodes(context, RECENT_EPISODES_LIMIT),
+                        QueueAccess.IDListAccess(DBReader.getQueueIDList(context))};
+            } else {
+                return null;
+            }
+        }
+
+        @Override
+        protected void onPostExecute(Object[] lists) {
+            super.onPostExecute(lists);
+            listView.setVisibility(View.VISIBLE);
+            progLoading.setVisibility(View.GONE);
+
+            if (lists != null) {
+                unreadItems = (List<FeedItem>) lists[0];
+                recentItems = (List<FeedItem>) lists[1];
+                queueAccess = (QueueAccess) lists[2];
+                itemsLoaded = true;
+                if (viewsCreated && activity.get() != null) {
+                    onFragmentLoaded();
+                }
+            }
+        }
+    }
+}
diff --git a/src/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java b/src/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java
index d6524853f..bab5143d5 100644
--- a/src/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java
+++ b/src/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java
@@ -1,112 +1,282 @@
 package de.danoeh.antennapod.fragment;
 
+import android.app.Activity;
 import android.content.Context;
+import android.content.res.TypedArray;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.util.Log;
-import de.danoeh.antennapod.BuildConfig;
-import de.danoeh.antennapod.adapter.InternalFeedItemlistAdapter;
+import android.os.Handler;
+import android.support.v4.app.ListFragment;
+import android.support.v4.view.MenuItemCompat;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.ListView;
+import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.adapter.DefaultActionButtonCallback;
+import de.danoeh.antennapod.adapter.FeedItemlistAdapter;
+import de.danoeh.antennapod.asynctask.DownloadObserver;
+import de.danoeh.antennapod.dialog.FeedItemDialog;
 import de.danoeh.antennapod.feed.EventDistributor;
 import de.danoeh.antennapod.feed.FeedItem;
+import de.danoeh.antennapod.feed.FeedMedia;
+import de.danoeh.antennapod.service.download.Downloader;
 import de.danoeh.antennapod.storage.DBReader;
+import de.danoeh.antennapod.storage.DBWriter;
+import de.danoeh.antennapod.util.QueueAccess;
 
 import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
 
-public class PlaybackHistoryFragment extends ItemlistFragment {
-	private static final String TAG = "PlaybackHistoryFragment";
+public class PlaybackHistoryFragment extends ListFragment {
+    private static final String TAG = "PlaybackHistoryFragment";
 
     private List<FeedItem> playbackHistory;
+    private QueueAccess queue;
+    private FeedItemlistAdapter adapter;
 
-	public PlaybackHistoryFragment() {
-		super(true);
-	}
+    private boolean itemsLoaded = false;
+    private boolean viewsCreated = false;
+
+    private AtomicReference<Activity> activity = new AtomicReference<Activity>();
+
+    private DownloadObserver downloadObserver;
+    private List<Downloader> downloaderList;
+
+    private FeedItemDialog feedItemDialog;
+    private FeedItemDialog.FeedItemDialogSavedInstance feedItemDialogSavedInstance;
 
-    InternalFeedItemlistAdapter.ItemAccess itemAccessRef;
     @Override
-    protected InternalFeedItemlistAdapter.ItemAccess itemAccess() {
-        if (itemAccessRef == null) {
-            itemAccessRef = new InternalFeedItemlistAdapter.ItemAccess() {
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setRetainInstance(true);
+        setHasOptionsMenu(true);
+    }
 
-                @Override
-                public FeedItem getItem(int position) {
-                    return (playbackHistory != null) ? playbackHistory.get(position) : null;
-                }
+    @Override
+    public void onResume() {
+        super.onResume();
+        startItemLoader();
+    }
 
-                @Override
-                public int getCount() {
-                    return (playbackHistory != null) ? playbackHistory.size() : 0;
-                }
+    @Override
+    public void onStart() {
+        super.onStart();
+        EventDistributor.getInstance().register(contentUpdate);
+    }
 
-                @Override
-                public boolean isInQueue(FeedItem item) {
-                    return (queue != null) ? queue.contains(item.getId()) : false;
-                }
-            };
+    @Override
+    public void onStop() {
+        super.onStop();
+        EventDistributor.getInstance().unregister(contentUpdate);
+        stopItemLoader();
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        stopItemLoader();
+        activity.set(null);
+    }
+
+    @Override
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+        this.activity.set(activity);
+        if (downloadObserver != null) {
+            downloadObserver.setActivity(activity);
+            downloadObserver.onResume();
+        }
+        if (viewsCreated && itemsLoaded) {
+            onFragmentLoaded();
         }
-        return itemAccessRef;
     }
 
     @Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		EventDistributor.getInstance().register(historyUpdate);
-	}
-
-	@Override
-	public void onDestroy() {
-		super.onDestroy();
-		EventDistributor.getInstance().unregister(historyUpdate);
-	}
-
-	private EventDistributor.EventListener historyUpdate = new EventDistributor.EventListener() {
-
-		@Override
-		public void update(EventDistributor eventDistributor, Integer arg) {
-			if ((EventDistributor.PLAYBACK_HISTORY_UPDATE & arg) != 0) {
-				if (BuildConfig.DEBUG)
-					Log.d(TAG, "Received content update");
-				loadData();
-			}
-
-		}
-	};
+    public void onDestroyView() {
+        super.onDestroyView();
+        adapter = null;
+        viewsCreated = false;
+        if (downloadObserver != null) {
+            downloadObserver.onPause();
+        }
+        if (feedItemDialog != null) {
+            feedItemDialogSavedInstance = feedItemDialog.save();
+        }
+        feedItemDialog = null;
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        viewsCreated = true;
+        if (itemsLoaded) {
+            onFragmentLoaded();
+        }
+    }
+
+    @Override
+    public void onListItemClick(ListView l, View v, int position, long id) {
+        super.onListItemClick(l, v, position, id);
+        FeedItem item = adapter.getItem(position - l.getHeaderViewsCount());
+        if (item != null) {
+            feedItemDialog = FeedItemDialog.newInstance(activity.get(), item, queue);
+            feedItemDialog.show();
+        }
+    }
 
     @Override
-    protected void loadData() {
-        AsyncTask<Void, Void, Void> loadTask = new AsyncTask<Void, Void, Void>() {
-            private volatile List<FeedItem> phRef;
-            private volatile List<Long> queueRef;
-
-            @Override
-            protected Void doInBackground(Void... voids) {
-                Context context = PlaybackHistoryFragment.this.getActivity();
-                if (context != null) {
-                    queueRef = DBReader.getQueueIDList(context);
-                    phRef = DBReader.getPlaybackHistory(context);
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        MenuItem clearHistory = menu.add(Menu.NONE, R.id.clear_history_item, Menu.CATEGORY_CONTAINER, R.string.clear_history_label);
+        MenuItemCompat.setShowAsAction(clearHistory, MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
+        TypedArray drawables = getActivity().obtainStyledAttributes(new int[] {R.attr.content_discard});
+        clearHistory.setIcon(drawables.getDrawable(0));
+        drawables.recycle();
+    }
+
+    @Override
+    public void onPrepareOptionsMenu(Menu menu) {
+        super.onPrepareOptionsMenu(menu);
+        menu.findItem(R.id.clear_history_item).setVisible(playbackHistory != null && !playbackHistory.isEmpty());
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (!super.onOptionsItemSelected(item)) {
+            switch(item.getItemId()) {
+                case R.id.clear_history_item:
+                    DBWriter.clearPlaybackHistory(getActivity());
+                    return true;
+                default:
+                    return false;
+            }
+        } else {
+            return true;
+        }
+    }
+
+    private EventDistributor.EventListener contentUpdate = new EventDistributor.EventListener() {
+
+        @Override
+        public void update(EventDistributor eventDistributor, Integer arg) {
+            if ((arg & EventDistributor.PLAYBACK_HISTORY_UPDATE) != 0) {
+                startItemLoader();
+                getActivity().supportInvalidateOptionsMenu();
+            }
+        }
+    };
+
+    private void onFragmentLoaded() {
+        if (adapter == null) {
+            adapter = new FeedItemlistAdapter(getActivity(), itemAccess, new DefaultActionButtonCallback(activity.get()), true);
+            setListAdapter(adapter);
+            downloadObserver = new DownloadObserver(activity.get(), new Handler(), downloadObserverCallback);
+            downloadObserver.onResume();
+        }
+        setListShown(true);
+        adapter.notifyDataSetChanged();
+        if (feedItemDialog != null && feedItemDialog.isShowing()) {
+            feedItemDialog.updateContent(queue, playbackHistory);
+        } else if (feedItemDialogSavedInstance != null) {
+            feedItemDialog = FeedItemDialog.newInstance(activity.get(), feedItemDialogSavedInstance);
+        }
+        getActivity().supportInvalidateOptionsMenu();
+    }
+
+    private DownloadObserver.Callback downloadObserverCallback = new DownloadObserver.Callback() {
+        @Override
+        public void onContentChanged() {
+            if (adapter != null) {
+                adapter.notifyDataSetChanged();
+            }
+            if (feedItemDialog != null && feedItemDialog.isShowing()) {
+                feedItemDialog.updateMenuAppearance();
+            }
+        }
+
+        @Override
+        public void onDownloadDataAvailable(List<Downloader> downloaderList) {
+            PlaybackHistoryFragment.this.downloaderList = downloaderList;
+            if (adapter != null) {
+                adapter.notifyDataSetChanged();
+            }
+        }
+    };
+
+    private FeedItemlistAdapter.ItemAccess itemAccess = new FeedItemlistAdapter.ItemAccess() {
+        @Override
+        public boolean isInQueue(FeedItem item) {
+            return (queue != null) ? queue.contains(item.getId()) : false;
+        }
+
+        @Override
+        public int getItemDownloadProgressPercent(FeedItem item) {
+            if (downloaderList != null) {
+                for (Downloader downloader : downloaderList) {
+                    if (downloader.getDownloadRequest().getFeedfileType() == FeedMedia.FEEDFILETYPE_FEEDMEDIA
+                            && downloader.getDownloadRequest().getFeedfileId() == item.getMedia().getId()) {
+                        return downloader.getDownloadRequest().getProgressPercent();
+                    }
                 }
+            }
+            return 0;
+        }
+
+        @Override
+        public int getCount() {
+            return (playbackHistory != null) ? playbackHistory.size() : 0;
+        }
+
+        @Override
+        public FeedItem getItem(int position) {
+            return (playbackHistory != null) ? playbackHistory.get(position) : null;
+        }
+    };
+
+    private ItemLoader itemLoader;
+
+    private void startItemLoader() {
+        if (itemLoader != null) {
+            itemLoader.cancel(true);
+        }
+        itemLoader = new ItemLoader();
+        itemLoader.execute();
+    }
+
+    private void stopItemLoader() {
+        if (itemLoader != null) {
+            itemLoader.cancel(true);
+        }
+    }
+
+    private class ItemLoader extends AsyncTask<Void, Void, Object[]> {
+
+        @Override
+        protected Object[] doInBackground(Void... params) {
+            Context context = activity.get();
+            if (context != null) {
+                List<FeedItem> ph = DBReader.getPlaybackHistory(context);
+                DBReader.loadFeedDataOfFeedItemlist(context, ph);
+                return new Object[]{ph,
+                        QueueAccess.IDListAccess(DBReader.getQueueIDList(context))};
+            } else {
                 return null;
             }
+        }
 
-            @Override
-            protected void onPostExecute(Void aVoid) {
-                super.onPostExecute(aVoid);
-                if (queueRef != null && phRef != null) {
-                    queue = queueRef;
-                    playbackHistory = phRef;
-                    Log.i(TAG, "Number of items in playback history: " + playbackHistory.size());
-                    if (fila != null) {
-                        fila.notifyDataSetChanged();
-                    }
-                } else {
-                    if (queueRef == null) {
-                        Log.e(TAG, "Could not load queue");
-                    }
-                    if (phRef == null) {
-                        Log.e(TAG, "Could not load playback history");
-                    }
+        @Override
+        protected void onPostExecute(Object[] res) {
+            super.onPostExecute(res);
+            if (res != null) {
+                playbackHistory = (List<FeedItem>) res[0];
+                queue = (QueueAccess) res[1];
+                itemsLoaded = true;
+                if (viewsCreated) {
+                    onFragmentLoaded();
                 }
             }
-        };
-        loadTask.execute();
+        }
     }
 }
diff --git a/src/de/danoeh/antennapod/fragment/QueueFragment.java b/src/de/danoeh/antennapod/fragment/QueueFragment.java
new file mode 100644
index 000000000..e3f0bb19d
--- /dev/null
+++ b/src/de/danoeh/antennapod/fragment/QueueFragment.java
@@ -0,0 +1,394 @@
+package de.danoeh.antennapod.fragment;
+
+import android.app.Activity;
+import android.content.Context;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Parcelable;
+import android.support.v4.app.Fragment;
+import android.support.v7.widget.SearchView;
+import android.util.Log;
+import android.view.*;
+import android.widget.AdapterView;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+import com.mobeta.android.dslv.DragSortListView;
+import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.activity.MainActivity;
+import de.danoeh.antennapod.adapter.DefaultActionButtonCallback;
+import de.danoeh.antennapod.adapter.QueueListAdapter;
+import de.danoeh.antennapod.asynctask.DownloadObserver;
+import de.danoeh.antennapod.dialog.FeedItemDialog;
+import de.danoeh.antennapod.feed.EventDistributor;
+import de.danoeh.antennapod.feed.FeedItem;
+import de.danoeh.antennapod.feed.FeedMedia;
+import de.danoeh.antennapod.service.download.Downloader;
+import de.danoeh.antennapod.storage.DBReader;
+import de.danoeh.antennapod.storage.DBWriter;
+import de.danoeh.antennapod.util.QueueAccess;
+import de.danoeh.antennapod.util.UndoBarController;
+import de.danoeh.antennapod.util.gui.FeedItemUndoToken;
+import de.danoeh.antennapod.util.menuhandler.MenuItemUtils;
+
+import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
+
+/**
+ * Shows all items in the queue
+ */
+public class QueueFragment extends Fragment {
+    private static final String TAG = "QueueFragment";
+    private static final int EVENTS = EventDistributor.DOWNLOAD_HANDLED |
+            EventDistributor.DOWNLOAD_QUEUED |
+            EventDistributor.QUEUE_UPDATE;
+
+    private DragSortListView listView;
+    private QueueListAdapter listAdapter;
+    private TextView txtvEmpty;
+    private ProgressBar progLoading;
+    private UndoBarController undoBarController;
+
+    private List<FeedItem> queue;
+    private List<Downloader> downloaderList;
+
+    private boolean itemsLoaded = false;
+    private boolean viewsCreated = false;
+
+    private AtomicReference<Activity> activity = new AtomicReference<Activity>();
+
+    private DownloadObserver downloadObserver = null;
+
+    private FeedItemDialog feedItemDialog;
+    private FeedItemDialog.FeedItemDialogSavedInstance feedItemDialogSavedInstance;
+
+    /**
+     * Download observer updates won't result in an upate of the list adapter if this is true.
+     */
+    private boolean blockDownloadObserverUpdate = false;
+
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setRetainInstance(true);
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        startItemLoader();
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        EventDistributor.getInstance().register(contentUpdate);
+        this.activity.set((MainActivity) getActivity());
+        if (downloadObserver != null) {
+            downloadObserver.setActivity(getActivity());
+            downloadObserver.onResume();
+        }
+        if (viewsCreated && itemsLoaded) {
+            onFragmentLoaded();
+        }
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        EventDistributor.getInstance().unregister(contentUpdate);
+        stopItemLoader();
+    }
+
+    @Override
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+        this.activity.set((MainActivity) activity);
+    }
+
+    private void resetViewState() {
+        unregisterForContextMenu(listView);
+        listAdapter = null;
+        undoBarController = null;
+        activity.set(null);
+        viewsCreated = false;
+        blockDownloadObserverUpdate = false;
+        if (downloadObserver != null) {
+            downloadObserver.onPause();
+        }
+        if (feedItemDialog != null) {
+            feedItemDialogSavedInstance = feedItemDialog.save();
+        }
+        feedItemDialog = null;
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        resetViewState();
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        final SearchView sv = new SearchView(getActivity());
+        MenuItemUtils.addSearchItem(menu, sv);
+        sv.setQueryHint(getString(R.string.search_hint));
+        sv.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+            @Override
+            public boolean onQueryTextSubmit(String s) {
+                sv.clearFocus();
+                ((MainActivity) getActivity()).loadChildFragment(SearchFragment.newInstance(s));
+                return true;
+            }
+
+            @Override
+            public boolean onQueryTextChange(String s) {
+                return false;
+            }
+        });
+    }
+
+    @Override
+    public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo) {
+        super.onCreateContextMenu(menu, v, menuInfo);
+        AdapterView.AdapterContextMenuInfo adapterInfo = (AdapterView.AdapterContextMenuInfo) menuInfo;
+        FeedItem item = itemAccess.getItem(adapterInfo.position);
+
+        MenuInflater inflater = getActivity().getMenuInflater();
+        inflater.inflate(R.menu.queue_context, menu);
+
+        if (item != null) {
+            menu.setHeaderTitle(item.getTitle());
+        }
+
+        menu.findItem(R.id.move_to_top_item).setEnabled(!queue.isEmpty() && queue.get(0) != item);
+        menu.findItem(R.id.move_to_bottom_item).setEnabled(!queue.isEmpty() && queue.get(queue.size() - 1) != item);
+    }
+
+    @Override
+    public boolean onContextItemSelected(MenuItem item) {
+        AdapterView.AdapterContextMenuInfo menuInfo = (AdapterView.AdapterContextMenuInfo) item.getMenuInfo();
+        FeedItem selectedItem = itemAccess.getItem(menuInfo.position);
+
+        if (selectedItem == null) {
+            Log.i(TAG, "Selected item at position " + menuInfo.position + " was null, ignoring selection");
+            return super.onContextItemSelected(item);
+        }
+
+        switch (item.getItemId()) {
+            case R.id.move_to_top_item:
+                DBWriter.moveQueueItemToTop(getActivity(), selectedItem.getId(), true);
+                return true;
+            case R.id.move_to_bottom_item:
+                DBWriter.moveQueueItemToBottom(getActivity(), selectedItem.getId(), true);
+                return true;
+            default:
+                return super.onContextItemSelected(item);
+        }
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        super.onCreateView(inflater, container, savedInstanceState);
+        ((MainActivity) getActivity()).getSupportActionBar().setTitle(R.string.queue_label);
+
+        View root = inflater.inflate(R.layout.queue_fragment, container, false);
+        listView = (DragSortListView) root.findViewById(android.R.id.list);
+        txtvEmpty = (TextView) root.findViewById(android.R.id.empty);
+        progLoading = (ProgressBar) root.findViewById(R.id.progLoading);
+        listView.setEmptyView(txtvEmpty);
+
+        listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                FeedItem item = (FeedItem) listAdapter.getItem(position - listView.getHeaderViewsCount());
+                if (item != null) {
+                    feedItemDialog = FeedItemDialog.newInstance(activity.get(), item, QueueAccess.ItemListAccess(queue));
+                    feedItemDialog.show();
+                }
+            }
+        });
+
+        undoBarController = new UndoBarController(root.findViewById(R.id.undobar), new UndoBarController.UndoListener() {
+            @Override
+            public void onUndo(Parcelable token) {
+                // Perform the undo
+                FeedItemUndoToken undoToken = (FeedItemUndoToken) token;
+                if (token != null) {
+                    long itemId = undoToken.getFeedItemId();
+                    int position = undoToken.getPosition();
+                    DBWriter.addQueueItemAt(getActivity(), itemId, position, false);
+                }
+            }
+        });
+
+        listView.setDragSortListener(new DragSortListView.DragSortListener() {
+            @Override
+            public void drag(int from, int to) {
+                Log.d(TAG, "drag");
+                blockDownloadObserverUpdate = true;
+            }
+
+            @Override
+            public void drop(int from, int to) {
+                Log.d(TAG, "drop");
+                blockDownloadObserverUpdate = false;
+                stopItemLoader();
+                final FeedItem item = queue.remove(from);
+                queue.add(to, item);
+                listAdapter.notifyDataSetChanged();
+                DBWriter.moveQueueItem(getActivity(), from, to, true);
+            }
+
+            @Override
+            public void remove(int which) {
+                stopItemLoader();
+                FeedItem item = (FeedItem) listView.getAdapter().getItem(which);
+                DBWriter.removeQueueItem(getActivity(), item.getId(), true);
+                undoBarController.showUndoBar(false,
+                        getString(R.string.removed_from_queue), new FeedItemUndoToken(item,
+                                which)
+                );
+            }
+        });
+
+        registerForContextMenu(listView);
+
+        if (!itemsLoaded) {
+            progLoading.setVisibility(View.VISIBLE);
+            txtvEmpty.setVisibility(View.GONE);
+        }
+
+        viewsCreated = true;
+
+        if (itemsLoaded && activity.get() != null) {
+            onFragmentLoaded();
+        }
+
+        return root;
+    }
+
+    private void onFragmentLoaded() {
+        if (listAdapter == null) {
+            listAdapter = new QueueListAdapter(activity.get(), itemAccess, new DefaultActionButtonCallback(activity.get()));
+            listView.setAdapter(listAdapter);
+            downloadObserver = new DownloadObserver(activity.get(), new Handler(), downloadObserverCallback);
+            downloadObserver.onResume();
+        }
+        listAdapter.notifyDataSetChanged();
+        if (feedItemDialog != null) {
+            feedItemDialog.updateContent(QueueAccess.ItemListAccess(queue), queue);
+        } else if (feedItemDialogSavedInstance != null) {
+            feedItemDialog = FeedItemDialog.newInstance(activity.get(), feedItemDialogSavedInstance);
+        }
+    }
+
+    private DownloadObserver.Callback downloadObserverCallback = new DownloadObserver.Callback() {
+        @Override
+        public void onContentChanged() {
+            if (listAdapter != null && !blockDownloadObserverUpdate) {
+                listAdapter.notifyDataSetChanged();
+            }
+            if (feedItemDialog != null && feedItemDialog.isShowing()) {
+                feedItemDialog.updateMenuAppearance();
+            }
+        }
+
+        @Override
+        public void onDownloadDataAvailable(List<Downloader> downloaderList) {
+            QueueFragment.this.downloaderList = downloaderList;
+            if (listAdapter != null && !blockDownloadObserverUpdate) {
+                listAdapter.notifyDataSetChanged();
+            }
+        }
+    };
+
+    private QueueListAdapter.ItemAccess itemAccess = new QueueListAdapter.ItemAccess() {
+        @Override
+        public int getCount() {
+            return (itemsLoaded) ? queue.size() : 0;
+        }
+
+        @Override
+        public FeedItem getItem(int position) {
+            return (itemsLoaded) ? queue.get(position) : null;
+        }
+
+        @Override
+        public int getItemDownloadProgressPercent(FeedItem item) {
+            if (downloaderList != null) {
+                for (Downloader downloader : downloaderList) {
+                    if (downloader.getDownloadRequest().getFeedfileType() == FeedMedia.FEEDFILETYPE_FEEDMEDIA
+                            && downloader.getDownloadRequest().getFeedfileId() == item.getMedia().getId()) {
+                        return downloader.getDownloadRequest().getProgressPercent();
+                    }
+                }
+            }
+            return 0;
+        }
+    };
+
+    private EventDistributor.EventListener contentUpdate = new EventDistributor.EventListener() {
+        @Override
+        public void update(EventDistributor eventDistributor, Integer arg) {
+            if ((arg & EVENTS) != 0) {
+                startItemLoader();
+            }
+        }
+    };
+
+    private ItemLoader itemLoader;
+
+    private void startItemLoader() {
+        if (itemLoader != null) {
+            itemLoader.cancel(true);
+        }
+        itemLoader = new ItemLoader();
+        itemLoader.execute();
+    }
+
+    private void stopItemLoader() {
+        if (itemLoader != null) {
+            itemLoader.cancel(true);
+        }
+    }
+
+    private class ItemLoader extends AsyncTask<Void, Void, List<FeedItem>> {
+        @Override
+        protected void onPreExecute() {
+            super.onPreExecute();
+            if (viewsCreated && !itemsLoaded) {
+                listView.setVisibility(View.GONE);
+                txtvEmpty.setVisibility(View.GONE);
+                progLoading.setVisibility(View.VISIBLE);
+            }
+        }
+
+        @Override
+        protected void onPostExecute(List<FeedItem> feedItems) {
+            super.onPostExecute(feedItems);
+            listView.setVisibility(View.VISIBLE);
+            progLoading.setVisibility(View.GONE);
+
+            if (feedItems != null) {
+                queue = feedItems;
+                itemsLoaded = true;
+                if (viewsCreated && activity.get() != null) {
+                    onFragmentLoaded();
+                }
+            }
+        }
+
+        @Override
+        protected List<FeedItem> doInBackground(Void... params) {
+            Context context = activity.get();
+            if (context != null) {
+                return DBReader.getQueue(context);
+            }
+            return null;
+        }
+    }
+}
diff --git a/src/de/danoeh/antennapod/fragment/RunningDownloadsFragment.java b/src/de/danoeh/antennapod/fragment/RunningDownloadsFragment.java
new file mode 100644
index 000000000..89c30e34b
--- /dev/null
+++ b/src/de/danoeh/antennapod/fragment/RunningDownloadsFragment.java
@@ -0,0 +1,69 @@
+package de.danoeh.antennapod.fragment;
+
+import android.os.Bundle;
+import android.os.Handler;
+import android.support.v4.app.ListFragment;
+import android.view.View;
+import de.danoeh.antennapod.adapter.DownloadlistAdapter;
+import de.danoeh.antennapod.asynctask.DownloadObserver;
+import de.danoeh.antennapod.service.download.Downloader;
+import de.danoeh.antennapod.storage.DownloadRequester;
+
+import java.util.List;
+
+/**
+ * Displays all running downloads and provides actions to cancel them
+ */
+public class RunningDownloadsFragment extends ListFragment {
+    private static final String TAG = "RunningDownloadsFragment";
+
+    private DownloadObserver downloadObserver;
+    private List<Downloader> downloaderList;
+
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        if (downloadObserver != null) {
+            downloadObserver.onPause();
+        }
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        final DownloadlistAdapter downloadlistAdapter = new DownloadlistAdapter(getActivity(), itemAccess);
+        setListAdapter(downloadlistAdapter);
+
+        downloadObserver = new DownloadObserver(getActivity(), new Handler(), new DownloadObserver.Callback() {
+            @Override
+            public void onContentChanged() {
+                downloadlistAdapter.notifyDataSetChanged();
+            }
+
+            @Override
+            public void onDownloadDataAvailable(List<Downloader> downloaderList) {
+                RunningDownloadsFragment.this.downloaderList = downloaderList;
+                downloadlistAdapter.notifyDataSetChanged();
+            }
+        });
+        downloadObserver.onResume();
+    }
+
+    private DownloadlistAdapter.ItemAccess itemAccess = new DownloadlistAdapter.ItemAccess() {
+        @Override
+        public int getCount() {
+            return (downloaderList != null) ? downloaderList.size() : 0;
+        }
+
+        @Override
+        public Downloader getItem(int position) {
+            return (downloaderList != null) ? downloaderList.get(position) : null;
+        }
+
+        @Override
+        public void onSecondaryActionClick(Downloader downloader) {
+            DownloadRequester.getInstance().cancelDownload(getActivity(), downloader.getDownloadRequest().getSource());
+        }
+    };
+}
diff --git a/src/de/danoeh/antennapod/fragment/SearchFragment.java b/src/de/danoeh/antennapod/fragment/SearchFragment.java
new file mode 100644
index 000000000..f89e44717
--- /dev/null
+++ b/src/de/danoeh/antennapod/fragment/SearchFragment.java
@@ -0,0 +1,254 @@
+package de.danoeh.antennapod.fragment;
+
+import android.content.Context;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.support.v4.app.ListFragment;
+import android.support.v4.view.MenuItemCompat;
+import android.support.v7.app.ActionBarActivity;
+import android.support.v7.widget.SearchView;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.ListView;
+import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.activity.MainActivity;
+import de.danoeh.antennapod.adapter.SearchlistAdapter;
+import de.danoeh.antennapod.dialog.FeedItemDialog;
+import de.danoeh.antennapod.feed.*;
+import de.danoeh.antennapod.storage.DBReader;
+import de.danoeh.antennapod.storage.FeedSearcher;
+import de.danoeh.antennapod.util.QueueAccess;
+
+import java.util.List;
+
+/**
+ * Performs a search operation on all feeds or one specific feed and displays the search result.
+ */
+public class SearchFragment extends ListFragment {
+    private static final String TAG = "SearchFragment";
+
+    private static final String ARG_QUERY = "query";
+    private static final String ARG_FEED = "feed";
+
+    private SearchlistAdapter searchAdapter;
+    private List<SearchResult> searchResults;
+
+    private boolean viewCreated = false;
+    private boolean itemsLoaded = false;
+
+    private QueueAccess queue;
+
+    private FeedItemDialog feedItemDialog;
+    private FeedItemDialog.FeedItemDialogSavedInstance feedItemDialogSavedInstance;
+
+    /**
+     * Create a new SearchFragment that searches all feeds.
+     */
+    public static SearchFragment newInstance(String query) {
+        if (query == null) query = "";
+        SearchFragment fragment = new SearchFragment();
+        Bundle args = new Bundle();
+        args.putString(ARG_QUERY, query);
+        args.putLong(ARG_FEED, 0);
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    /**
+     * Create a new SearchFragment that searches one specific feed.
+     */
+    public static SearchFragment newInstance(String query, long feed) {
+        SearchFragment fragment = newInstance(query);
+        fragment.getArguments().putLong(ARG_FEED, feed);
+        return fragment;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setRetainInstance(true);
+        setHasOptionsMenu(true);
+        startSearchTask();
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        EventDistributor.getInstance().register(contentUpdate);
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        stopSearchTask();
+        EventDistributor.getInstance().unregister(contentUpdate);
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        stopSearchTask();
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        searchAdapter = null;
+        viewCreated = false;
+        if (feedItemDialog != null) {
+            feedItemDialogSavedInstance = feedItemDialog.save();
+        }
+        feedItemDialog = null;
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        ((ActionBarActivity) getActivity()).getSupportActionBar().setTitle(R.string.search_label);
+        viewCreated = true;
+        if (itemsLoaded) {
+            onFragmentLoaded();
+        }
+    }
+
+    @Override
+    public void onListItemClick(ListView l, View v, int position, long id) {
+        super.onListItemClick(l, v, position, id);
+        SearchResult result = (SearchResult) l.getAdapter().getItem(position);
+        FeedComponent comp = result.getComponent();
+        if (comp.getClass() == Feed.class) {
+            ((MainActivity)getActivity()).loadFeedFragment(comp.getId());
+        } else {
+            if (comp.getClass() == FeedItem.class) {
+                feedItemDialog = FeedItemDialog.newInstance(getActivity(), (FeedItem) comp, queue);
+                feedItemDialog.show();
+            }
+        }
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        MenuItem item = menu.add(Menu.NONE, R.id.search_item, Menu.NONE, R.string.search_label);
+        MenuItemCompat.setShowAsAction(item, MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
+        final SearchView sv = new SearchView(getActivity());
+        sv.setQueryHint(getString(R.string.search_hint));
+        sv.setQuery(getArguments().getString(ARG_QUERY), false);
+        sv.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+            @Override
+            public boolean onQueryTextSubmit(String s) {
+                getArguments().putString(ARG_QUERY, s);
+                itemsLoaded = false;
+                startSearchTask();
+                return true;
+            }
+
+            @Override
+            public boolean onQueryTextChange(String s) {
+                return false;
+            }
+        });
+        MenuItemCompat.setActionView(item, sv);
+    }
+
+    private final EventDistributor.EventListener contentUpdate = new EventDistributor.EventListener() {
+        @Override
+        public void update(EventDistributor eventDistributor, Integer arg) {
+            if ((arg & (EventDistributor.DOWNLOAD_QUEUED)) != 0) {
+                feedItemDialog.updateMenuAppearance();
+            }
+            if ((arg & (EventDistributor.UNREAD_ITEMS_UPDATE
+                    | EventDistributor.DOWNLOAD_HANDLED
+                    | EventDistributor.QUEUE_UPDATE)) != 0) {
+                startSearchTask();
+            }
+        }
+    };
+
+    private void onFragmentLoaded() {
+        if (searchAdapter == null) {
+            searchAdapter = new SearchlistAdapter(getActivity(), itemAccess);
+            setListAdapter(searchAdapter);
+        }
+        searchAdapter.notifyDataSetChanged();
+        setListShown(true);
+        if (feedItemDialog != null && feedItemDialog.isShowing()) {
+            feedItemDialog.setQueue(queue);
+            for (SearchResult result : searchResults) {
+                FeedComponent comp = result.getComponent();
+                if (comp.getClass() == FeedItem.class && ((FeedItem) comp).getId() == feedItemDialog.getItem().getId()) {
+                    feedItemDialog.setItem((FeedItem) comp);
+                }
+            }
+            feedItemDialog.updateMenuAppearance();
+        } else if (feedItemDialogSavedInstance != null) {
+            feedItemDialog = FeedItemDialog.newInstance(getActivity(), feedItemDialogSavedInstance);
+        }
+    }
+
+    private final SearchlistAdapter.ItemAccess itemAccess = new SearchlistAdapter.ItemAccess() {
+        @Override
+        public int getCount() {
+            return (searchResults != null) ? searchResults.size() : 0;
+        }
+
+        @Override
+        public SearchResult getItem(int position) {
+            return (searchResults != null) ? searchResults.get(position) : null;
+        }
+    };
+
+    private SearchTask searchTask;
+
+    private void startSearchTask() {
+        if (searchTask != null) {
+            searchTask.cancel(true);
+        }
+        searchTask = new SearchTask();
+        searchTask.execute(getArguments());
+    }
+
+    private void stopSearchTask() {
+        if (searchTask != null) {
+            searchTask.cancel(true);
+        }
+    }
+
+    private class SearchTask extends AsyncTask<Bundle, Void, Object[]> {
+        @Override
+        protected Object[] doInBackground(Bundle... params) {
+            String query = params[0].getString(ARG_QUERY);
+            long feed = params[0].getLong(ARG_FEED);
+            Context context = getActivity();
+            if (context != null) {
+                return new Object[]{FeedSearcher.performSearch(context, query, feed),
+                        QueueAccess.IDListAccess(DBReader.getQueueIDList(context))};
+            } else {
+                return null;
+            }
+        }
+
+        @Override
+        protected void onPreExecute() {
+            super.onPreExecute();
+            if (viewCreated && !itemsLoaded) {
+                setListShown(false);
+            }
+        }
+
+        @Override
+        protected void onPostExecute(Object[] results) {
+            super.onPostExecute(results);
+            if (results != null) {
+                itemsLoaded = true;
+                searchResults = (List<SearchResult>) results[0];
+                queue = (QueueAccess) results[1];
+                if (viewCreated) {
+                    onFragmentLoaded();
+                }
+            }
+        }
+    }
+}
diff --git a/src/de/danoeh/antennapod/fragment/gpodnet/GpodnetMainFragment.java b/src/de/danoeh/antennapod/fragment/gpodnet/GpodnetMainFragment.java
new file mode 100644
index 000000000..ec8f69368
--- /dev/null
+++ b/src/de/danoeh/antennapod/fragment/gpodnet/GpodnetMainFragment.java
@@ -0,0 +1,131 @@
+package de.danoeh.antennapod.fragment.gpodnet;
+
+import android.app.Activity;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentPagerAdapter;
+import android.support.v4.app.FragmentTransaction;
+import android.support.v4.view.ViewPager;
+import android.support.v7.app.ActionBar;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.activity.MainActivity;
+
+/**
+ * Main navigation hub for gpodder.net podcast directory
+ */
+public class GpodnetMainFragment extends Fragment {
+
+    private ViewPager pager;
+    private MainActivity activity;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        super.onCreateView(inflater, container, savedInstanceState);
+        View root = inflater.inflate(R.layout.pager_fragment, container, false);
+        pager = (ViewPager) root.findViewById(R.id.pager);
+        GpodnetPagerAdapter pagerAdapter = new GpodnetPagerAdapter(getChildFragmentManager(), getResources());
+        pager.setAdapter(pagerAdapter);
+        final ActionBar actionBar = activity.getMainActivtyActionBar();
+        actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
+        ActionBar.TabListener tabListener = new ActionBar.TabListener() {
+            @Override
+            public void onTabSelected(ActionBar.Tab tab, FragmentTransaction fragmentTransaction) {
+                pager.setCurrentItem(tab.getPosition());
+            }
+
+            @Override
+            public void onTabUnselected(ActionBar.Tab tab, FragmentTransaction fragmentTransaction) {
+
+            }
+
+            @Override
+            public void onTabReselected(ActionBar.Tab tab, FragmentTransaction fragmentTransaction) {
+
+            }
+        };
+        actionBar.removeAllTabs();
+        actionBar.addTab(actionBar.newTab()
+                .setText(R.string.gpodnet_taglist_header)
+                .setTabListener(tabListener));
+        actionBar.addTab(actionBar.newTab()
+                .setText(R.string.gpodnet_toplist_header)
+                .setTabListener(tabListener));
+        actionBar.setTitle(R.string.gpodnet_main_label);
+
+        pager.setOnPageChangeListener(new ViewPager.SimpleOnPageChangeListener() {
+            @Override
+            public void onPageSelected(int position) {
+                super.onPageSelected(position);
+                actionBar.setSelectedNavigationItem(position);
+            }
+        });
+        return root;
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        activity.getMainActivtyActionBar().removeAllTabs();
+        activity.getMainActivtyActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
+    }
+
+    @Override
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+        this.activity = (MainActivity) activity;
+    }
+
+    public class GpodnetPagerAdapter extends FragmentPagerAdapter {
+
+
+        private static final int NUM_PAGES = 2;
+        private static final int POS_TAGS = 0;
+        private static final int POS_TOPLIST = 1;
+        private static final int POS_SUGGESTIONS = 2;
+
+        Resources resources;
+
+        public GpodnetPagerAdapter(FragmentManager fm, Resources resources) {
+            super(fm);
+            this.resources = resources;
+        }
+
+        @Override
+        public Fragment getItem(int i) {
+            switch (i) {
+                case POS_TAGS:
+                    return new TagListFragment();
+                case POS_TOPLIST:
+                    return new PodcastTopListFragment();
+                case POS_SUGGESTIONS:
+                    return new SuggestionListFragment();
+                default:
+                    return null;
+            }
+        }
+
+        @Override
+        public CharSequence getPageTitle(int position) {
+            switch (position) {
+                case POS_TAGS:
+                    return getString(R.string.gpodnet_taglist_header);
+                case POS_TOPLIST:
+                    return getString(R.string.gpodnet_toplist_header);
+                case POS_SUGGESTIONS:
+                    return getString(R.string.gpodnet_suggestions_header);
+                default:
+                    return super.getPageTitle(position);
+            }
+        }
+
+        @Override
+        public int getCount() {
+            return NUM_PAGES;
+        }
+    }
+}
diff --git a/src/de/danoeh/antennapod/fragment/gpodnet/PodcastListFragment.java b/src/de/danoeh/antennapod/fragment/gpodnet/PodcastListFragment.java
index 4164429b2..837df0594 100644
--- a/src/de/danoeh/antennapod/fragment/gpodnet/PodcastListFragment.java
+++ b/src/de/danoeh/antennapod/fragment/gpodnet/PodcastListFragment.java
@@ -5,19 +5,22 @@ import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
+import android.support.v7.widget.*;
 import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
+import android.view.*;
 import android.widget.*;
+import android.widget.SearchView;
 import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.DefaultOnlineFeedViewActivity;
+import de.danoeh.antennapod.activity.MainActivity;
 import de.danoeh.antennapod.activity.OnlineFeedViewActivity;
 import de.danoeh.antennapod.adapter.gpodnet.PodcastListAdapter;
+import de.danoeh.antennapod.fragment.SearchFragment;
 import de.danoeh.antennapod.gpoddernet.GpodnetService;
 import de.danoeh.antennapod.gpoddernet.GpodnetServiceException;
 import de.danoeh.antennapod.gpoddernet.model.GpodnetPodcast;
+import de.danoeh.antennapod.util.menuhandler.MenuItemUtils;
 
 import java.util.List;
 
@@ -33,8 +36,34 @@ public abstract class PodcastListFragment extends Fragment {
     private Button butRetry;
 
     @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        final android.support.v7.widget.SearchView sv = new android.support.v7.widget.SearchView(getActivity());
+        MenuItemUtils.addSearchItem(menu, sv);
+        sv.setQueryHint(getString(R.string.gpodnet_search_hint));
+        sv.setOnQueryTextListener(new android.support.v7.widget.SearchView.OnQueryTextListener() {
+            @Override
+            public boolean onQueryTextSubmit(String s) {
+                sv.clearFocus();
+                ((MainActivity) getActivity()).loadChildFragment(SearchListFragment.newInstance(s));
+                return true;
+            }
+
+            @Override
+            public boolean onQueryTextChange(String s) {
+                return false;
+            }
+        });
+    }
+
+    @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        setRetainInstance(true);
         View root = inflater.inflate(R.layout.gpodnet_podcast_list, container, false);
 
         gridView = (GridView) root.findViewById(R.id.gridView);
diff --git a/src/de/danoeh/antennapod/fragment/gpodnet/SearchListFragment.java b/src/de/danoeh/antennapod/fragment/gpodnet/SearchListFragment.java
index 322d13097..79d0c5d6f 100644
--- a/src/de/danoeh/antennapod/fragment/gpodnet/SearchListFragment.java
+++ b/src/de/danoeh/antennapod/fragment/gpodnet/SearchListFragment.java
@@ -1,14 +1,21 @@
 package de.danoeh.antennapod.fragment.gpodnet;
 
 import android.os.Bundle;
+import android.support.v7.widget.SearchView;
+import android.view.Menu;
+import android.view.MenuInflater;
+import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.activity.MainActivity;
+import de.danoeh.antennapod.fragment.SearchFragment;
 import de.danoeh.antennapod.gpoddernet.GpodnetService;
 import de.danoeh.antennapod.gpoddernet.GpodnetServiceException;
 import de.danoeh.antennapod.gpoddernet.model.GpodnetPodcast;
+import de.danoeh.antennapod.util.menuhandler.MenuItemUtils;
 
 import java.util.List;
 
 /**
- * Created by daniel on 23.08.13.
+ * Performs a search on the gpodder.net directory and displays the results.
  */
 public class SearchListFragment extends PodcastListFragment {
     private static final String ARG_QUERY = "query";
@@ -26,6 +33,7 @@ public class SearchListFragment extends PodcastListFragment {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
         if (getArguments() != null && getArguments().containsKey(ARG_QUERY)) {
             this.query = getArguments().getString(ARG_QUERY);
         } else {
@@ -34,6 +42,27 @@ public class SearchListFragment extends PodcastListFragment {
     }
 
     @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        final SearchView sv = new SearchView(getActivity());
+        MenuItemUtils.addSearchItem(menu, sv);
+        sv.setQueryHint(getString(R.string.gpodnet_search_hint));
+        sv.setQuery(query, false);
+        sv.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+            @Override
+            public boolean onQueryTextSubmit(String s) {
+                sv.clearFocus();
+                changeQuery(s);
+                return true;
+            }
+
+            @Override
+            public boolean onQueryTextChange(String s) {
+                return false;
+            }
+        });
+    }
+
+    @Override
     protected List<GpodnetPodcast> loadPodcastData(GpodnetService service) throws GpodnetServiceException {
         return service.searchPodcasts(query, 0);
     }
diff --git a/src/de/danoeh/antennapod/fragment/gpodnet/TagFragment.java b/src/de/danoeh/antennapod/fragment/gpodnet/TagFragment.java
new file mode 100644
index 000000000..f016290bf
--- /dev/null
+++ b/src/de/danoeh/antennapod/fragment/gpodnet/TagFragment.java
@@ -0,0 +1,47 @@
+package de.danoeh.antennapod.fragment.gpodnet;
+
+import android.os.Bundle;
+import de.danoeh.antennapod.activity.MainActivity;
+import de.danoeh.antennapod.gpoddernet.GpodnetService;
+import de.danoeh.antennapod.gpoddernet.GpodnetServiceException;
+import de.danoeh.antennapod.gpoddernet.model.GpodnetPodcast;
+import de.danoeh.antennapod.gpoddernet.model.GpodnetTag;
+
+import java.util.List;
+
+/**
+ * Shows all podcasts from gpodder.net that belong to a specific tag.
+ * Use the newInstance method of this class to create a new TagFragment.
+ */
+public class TagFragment extends PodcastListFragment {
+
+    private static final String TAG = "TagFragment";
+    private static final int PODCAST_COUNT = 50;
+
+    private GpodnetTag tag;
+
+    public static TagFragment newInstance(String tagName) {
+        if (tagName == null) throw new IllegalArgumentException("tagName = null");
+        TagFragment fragment = new TagFragment();
+        Bundle args = new Bundle();
+        args.putString("tag", tagName);
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        Bundle args = getArguments();
+        if (args == null || args.getString("tag") == null) throw new IllegalArgumentException("args invalid");
+
+        tag = new GpodnetTag(args.getString("tag"));
+        ((MainActivity) getActivity()).getMainActivtyActionBar().setTitle(tag.getName());
+    }
+
+    @Override
+    protected List<GpodnetPodcast> loadPodcastData(GpodnetService service) throws GpodnetServiceException {
+        return service.getPodcastsForTag(tag, PODCAST_COUNT);
+    }
+}
diff --git a/src/de/danoeh/antennapod/fragment/gpodnet/TagListFragment.java b/src/de/danoeh/antennapod/fragment/gpodnet/TagListFragment.java
index fcb9d01c5..880726e50 100644
--- a/src/de/danoeh/antennapod/fragment/gpodnet/TagListFragment.java
+++ b/src/de/danoeh/antennapod/fragment/gpodnet/TagListFragment.java
@@ -1,18 +1,23 @@
 package de.danoeh.antennapod.fragment.gpodnet;
 
 import android.content.Context;
-import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.v4.app.ListFragment;
+import android.support.v7.widget.SearchView;
+import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.TextView;
-import de.danoeh.antennapod.activity.gpoddernet.GpodnetTagActivity;
+import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.activity.MainActivity;
+import de.danoeh.antennapod.fragment.SearchFragment;
 import de.danoeh.antennapod.gpoddernet.GpodnetService;
 import de.danoeh.antennapod.gpoddernet.GpodnetServiceException;
 import de.danoeh.antennapod.gpoddernet.model.GpodnetTag;
+import de.danoeh.antennapod.util.menuhandler.MenuItemUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -22,17 +27,42 @@ public class TagListFragment extends ListFragment {
     private static final int COUNT = 50;
 
     @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        final SearchView sv = new SearchView(getActivity());
+        MenuItemUtils.addSearchItem(menu, sv);
+        sv.setQueryHint(getString(R.string.gpodnet_search_hint));
+        sv.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+            @Override
+            public boolean onQueryTextSubmit(String s) {
+                sv.clearFocus();
+                ((MainActivity) getActivity()).loadChildFragment(SearchListFragment.newInstance(s));
+                return true;
+            }
+
+            @Override
+            public boolean onQueryTextChange(String s) {
+                return false;
+            }
+        });
+    }
+
+    @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        setRetainInstance(true);
 
         getListView().setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                 String selectedTag = (String) getListAdapter().getItem(position);
-                Intent intent = new Intent(getActivity(), GpodnetTagActivity.class);
-                intent.putExtra(GpodnetTagActivity.ARG_TAGNAME, selectedTag);
-                startActivity(intent);
+                MainActivity activity = (MainActivity) getActivity();
+                activity.loadChildFragment(TagFragment.newInstance(selectedTag));
             }
         });
 
diff --git a/src/de/danoeh/antennapod/service/download/DownloadService.java b/src/de/danoeh/antennapod/service/download/DownloadService.java
index b17f113ea..0f9c7bd7f 100644
--- a/src/de/danoeh/antennapod/service/download/DownloadService.java
+++ b/src/de/danoeh/antennapod/service/download/DownloadService.java
@@ -13,6 +13,7 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.media.MediaMetadataRetriever;
 import android.os.Binder;
+import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
 import android.support.v4.app.NotificationCompat;
@@ -23,7 +24,10 @@ import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.DownloadActivity;
 import de.danoeh.antennapod.activity.DownloadAuthenticationActivity;
 import de.danoeh.antennapod.activity.DownloadLogActivity;
+import de.danoeh.antennapod.activity.MainActivity;
+import de.danoeh.antennapod.adapter.NavListAdapter;
 import de.danoeh.antennapod.feed.*;
+import de.danoeh.antennapod.fragment.DownloadsFragment;
 import de.danoeh.antennapod.storage.*;
 import de.danoeh.antennapod.syndication.handler.FeedHandler;
 import de.danoeh.antennapod.syndication.handler.UnsupportedFeedtypeException;
@@ -288,11 +292,18 @@ public class DownloadService extends Service {
 
     @SuppressLint("NewApi")
     private void setupNotificationBuilders() {
-        PendingIntent pIntent = PendingIntent.getActivity(this, 0, new Intent(
-                        this, DownloadActivity.class),
+        Intent intent = new Intent(this, MainActivity.class);
+        intent.putExtra(MainActivity.EXTRA_NAV_TYPE, NavListAdapter.VIEW_TYPE_NAV);
+        intent.putExtra(MainActivity.EXTRA_NAV_INDEX, MainActivity.POS_DOWNLOADS);
+        Bundle args = new Bundle();
+        args.putInt(DownloadsFragment.ARG_SELECTED_TAB, DownloadsFragment.POS_RUNNING);
+        intent.putExtra(MainActivity.EXTRA_FRAGMENT_ARGS, args);
+
+        PendingIntent pIntent = PendingIntent.getActivity(this, 0, intent,
                 PendingIntent.FLAG_UPDATE_CURRENT
         );
 
+
         Bitmap icon = BitmapFactory.decodeResource(getResources(),
                 R.drawable.stat_notify_sync);
 
@@ -366,7 +377,7 @@ public class DownloadService extends Service {
             if (notificationCompatBuilder != null) {
                 notificationCompatBuilder.setContentTitle(contentTitle);
                 notificationCompatBuilder.setContentText(downloadsLeft);
-                return notificationCompatBuilder.getNotification();
+                return notificationCompatBuilder.build();
             }
         }
         return null;
@@ -510,6 +521,13 @@ public class DownloadService extends Service {
         if (createReport) {
             if (BuildConfig.DEBUG)
                 Log.d(TAG, "Creating report");
+            Intent intent = new Intent(this, MainActivity.class);
+            intent.putExtra(MainActivity.EXTRA_NAV_TYPE, NavListAdapter.VIEW_TYPE_NAV);
+            intent.putExtra(MainActivity.EXTRA_NAV_INDEX, MainActivity.POS_DOWNLOADS);
+            Bundle args = new Bundle();
+            args.putInt(DownloadsFragment.ARG_SELECTED_TAB, DownloadsFragment.POS_LOG);
+            intent.putExtra(MainActivity.EXTRA_FRAGMENT_ARGS, args);
+
             // create notification object
             Notification notification = new NotificationCompat.Builder(this)
                     .setTicker(
@@ -527,10 +545,9 @@ public class DownloadService extends Service {
                                     R.drawable.stat_notify_sync)
                     )
                     .setContentIntent(
-                            PendingIntent.getActivity(this, 0, new Intent(this,
-                                    DownloadLogActivity.class), 0)
+                            PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT)
                     )
-                    .setAutoCancel(true).getNotification();
+                    .setAutoCancel(true).build();
             NotificationManager nm = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
             nm.notify(REPORT_ID, notification);
         } else {
diff --git a/src/de/danoeh/antennapod/service/playback/PlaybackServiceMediaPlayer.java b/src/de/danoeh/antennapod/service/playback/PlaybackServiceMediaPlayer.java
index 82759a902..24ff9b3fa 100644
--- a/src/de/danoeh/antennapod/service/playback/PlaybackServiceMediaPlayer.java
+++ b/src/de/danoeh/antennapod/service/playback/PlaybackServiceMediaPlayer.java
@@ -509,19 +509,13 @@ public class PlaybackServiceMediaPlayer {
     }
 
     /**
-     * Returns true if the playback speed can be adjusted. This method can also return false if the PSMP object's
-     * internal MediaPlayer cannot be accessed at the moment.
+     * Returns true if the playback speed can be adjusted.
      */
     public boolean canSetSpeed() {
-        if (!playerLock.tryLock()) {
-            return false;
-        }
         boolean retVal = false;
         if (mediaPlayer != null && media != null && media.getMediaType() == MediaType.AUDIO) {
             retVal = (mediaPlayer).canSetSpeed();
         }
-
-        playerLock.unlock();
         return retVal;
     }
 
diff --git a/src/de/danoeh/antennapod/storage/DBReader.java b/src/de/danoeh/antennapod/storage/DBReader.java
index 63be7a79d..4aeca7cd6 100644
--- a/src/de/danoeh/antennapod/storage/DBReader.java
+++ b/src/de/danoeh/antennapod/storage/DBReader.java
@@ -504,6 +504,32 @@ public final class DBReader {
         return itemIds;
     }
 
+
+    /**
+     * Loads a list of FeedItems sorted by pubDate in descending order.
+     *
+     * @param context A context that is used for opening a database connection.
+     * @param limit The maximum number of episodes that should be loaded.
+     * */
+    public static List<FeedItem> getRecentlyPublishedEpisodes(Context context, int limit) {
+        if (BuildConfig.DEBUG)
+            Log.d(TAG, "Extracting recently published items list");
+
+        PodDBAdapter adapter = new PodDBAdapter(context);
+        adapter.open();
+
+        Cursor itemlistCursor = adapter.getRecentlyPublishedItemsCursor(limit);
+        List<FeedItem> items = extractItemlistFromCursor(adapter,
+                itemlistCursor);
+        itemlistCursor.close();
+
+        loadFeedDataOfFeedItemlist(context, items);
+
+        adapter.close();
+
+        return items;
+    }
+
     /**
      * Loads the playback history from the database. A FeedItem is in the playback history if playback of the correpsonding episode
      * has been completed at least once.
diff --git a/src/de/danoeh/antennapod/storage/PodDBAdapter.java b/src/de/danoeh/antennapod/storage/PodDBAdapter.java
index e83f00f31..285709537 100644
--- a/src/de/danoeh/antennapod/storage/PodDBAdapter.java
+++ b/src/de/danoeh/antennapod/storage/PodDBAdapter.java
@@ -1001,6 +1001,11 @@ public class PodDBAdapter {
 
     }
 
+    public final Cursor getRecentlyPublishedItemsCursor(int limit) {
+        Cursor c = db.query(TABLE_NAME_FEED_ITEMS, FEEDITEM_SEL_FI_SMALL, null, null, null, null, KEY_PUBDATE + " DESC LIMIT " + limit);
+        return c;
+    }
+
     public Cursor getDownloadedItemsCursor() {
         final String query = "SELECT " + SEL_FI_SMALL_STR + " FROM " + TABLE_NAME_FEED_ITEMS
                 + " INNER JOIN " + TABLE_NAME_FEED_MEDIA + " ON "
diff --git a/src/de/danoeh/antennapod/util/gui/FeedItemUndoToken.java b/src/de/danoeh/antennapod/util/gui/FeedItemUndoToken.java
new file mode 100644
index 000000000..b920559db
--- /dev/null
+++ b/src/de/danoeh/antennapod/util/gui/FeedItemUndoToken.java
@@ -0,0 +1,55 @@
+package de.danoeh.antennapod.util.gui;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+import de.danoeh.antennapod.feed.FeedItem;
+
+/**
+ * Used by an UndoBarController for saving a removed FeedItem
+ */
+public class FeedItemUndoToken implements Parcelable {
+    private long itemId;
+    private long feedId;
+    private int position;
+
+    public FeedItemUndoToken(FeedItem item, int position) {
+        this.itemId = item.getId();
+        this.feedId = item.getFeed().getId();
+        this.position = position;
+    }
+
+    private FeedItemUndoToken(Parcel in) {
+        itemId = in.readLong();
+        feedId = in.readLong();
+        position = in.readInt();
+    }
+
+    public static final Parcelable.Creator<FeedItemUndoToken> CREATOR = new Parcelable.Creator<FeedItemUndoToken>() {
+        public FeedItemUndoToken createFromParcel(Parcel in) {
+            return new FeedItemUndoToken(in);
+        }
+
+        public FeedItemUndoToken[] newArray(int size) {
+            return new FeedItemUndoToken[size];
+        }
+    };
+
+    public int describeContents() {
+        return 0;
+    }
+
+    public void writeToParcel(Parcel out, int flags) {
+        out.writeLong(itemId);
+        out.writeLong(feedId);
+        out.writeInt(position);
+    }
+
+    public long getFeedItemId() {
+        return itemId;
+    }
+
+    public int getPosition() {
+        return position;
+    }
+}
+
diff --git a/src/de/danoeh/antennapod/util/menuhandler/FeedMenuHandler.java b/src/de/danoeh/antennapod/util/menuhandler/FeedMenuHandler.java
index ae8b3ac1e..a3adec66d 100644
--- a/src/de/danoeh/antennapod/util/menuhandler/FeedMenuHandler.java
+++ b/src/de/danoeh/antennapod/util/menuhandler/FeedMenuHandler.java
@@ -60,12 +60,6 @@ public class FeedMenuHandler {
 	public static boolean onOptionsItemClicked(Context context, MenuItem item,
 			Feed selectedFeed) throws DownloadRequestException {
 		switch (item.getItemId()) {
-		case R.id.show_info_item:
-			Intent startIntent = new Intent(context, FeedInfoActivity.class);
-			startIntent.putExtra(FeedInfoActivity.EXTRA_FEED_ID,
-					selectedFeed.getId());
-			context.startActivity(startIntent);
-			break;
 		case R.id.refresh_item:
 			DBTasks.refreshFeed(context, selectedFeed);
 			break;
diff --git a/src/de/danoeh/antennapod/util/menuhandler/MenuItemUtils.java b/src/de/danoeh/antennapod/util/menuhandler/MenuItemUtils.java
new file mode 100644
index 000000000..e75fa394a
--- /dev/null
+++ b/src/de/danoeh/antennapod/util/menuhandler/MenuItemUtils.java
@@ -0,0 +1,20 @@
+package de.danoeh.antennapod.util.menuhandler;
+
+import android.support.v4.view.MenuItemCompat;
+import android.support.v7.widget.SearchView;
+import android.view.Menu;
+import android.view.MenuItem;
+import de.danoeh.antennapod.R;
+
+/**
+ * Utilities for menu items
+ */
+public class MenuItemUtils {
+
+    public static MenuItem addSearchItem(Menu menu, SearchView searchView) {
+        MenuItem item = menu.add(Menu.NONE, R.id.search_item, Menu.NONE, R.string.search_label);
+        MenuItemCompat.setShowAsAction(item, MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
+        MenuItemCompat.setActionView(item, searchView);
+        return item;
+    }
+}