diff --git a/res/menu/feedlist.xml b/res/menu/feedlist.xml
index 3caf48d96..27bcdb59a 100644
--- a/res/menu/feedlist.xml
+++ b/res/menu/feedlist.xml
@@ -4,18 +4,18 @@
         android:id="@+id/add_feed"
         android:title="Add Feed"
         android:icon="@drawable/content_new"
-        android:showAsAction="ifRoom">
+        android:showAsAction="ifRoom|collapseActionView">
     </item>
     <item
         android:id="@+id/all_feed_refresh"
         android:title="Refresh"
         android:icon="@drawable/navigation_refresh"
-        android:showAsAction="ifRoom">
+        android:showAsAction="ifRoom|collapseActionView">
     </item>
     <item
         android:id="@+id/show_downloads"
         android:title="Downloads"
         android:icon="@drawable/av_download"
-        android:showAsAction="ifRoom">
+        android:showAsAction="ifRoom|collapseActionView">
     </item>
 </menu>
diff --git a/src/de/podfetcher/storage/DownloadRequester.java b/src/de/podfetcher/storage/DownloadRequester.java
index a92b3a0e7..17b32bd93 100644
--- a/src/de/podfetcher/storage/DownloadRequester.java
+++ b/src/de/podfetcher/storage/DownloadRequester.java
@@ -117,6 +117,7 @@ public class DownloadRequester {
 			FeedFile f = getFeedFile(id);
 			if (f != null) {
 				downloads.remove(f);
+				f.setFile_url(null);
 			}
 		}
 	}