diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index cce892747..16c802de1 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -100,35 +100,6 @@
             </intent-filter>
 
         </activity>
-        <activity
-            android:name="de.danoeh.antennapod.activity.AddFeedActivity"
-            android:configChanges="keyboardHidden|orientation"
-            android:label="@string/add_new_feed_label"
-            android:windowSoftInputMode="adjustResize">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="de.danoeh.antennapod.activity.MainActivity"/>
-
-
-        </activity>
-        <activity
-            android:name="de.danoeh.antennapod.activity.FeedItemlistActivity"
-            android:configChanges="orientation|screenSize">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="de.danoeh.antennapod.activity.MainActivity"/>
-        </activity>
-        <activity
-            android:name="de.danoeh.antennapod.activity.ItemviewActivity"
-            android:configChanges="keyboard|orientation"/>
-        <activity
-            android:name="de.danoeh.antennapod.activity.DownloadActivity"
-            android:label="@string/downloads_label"
-            android:exported="true">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="de.danoeh.antennapod.activity.MainActivity"/>
-        </activity>
         <activity
             android:name=".activity.AudioplayerActivity"
             android:launchMode="singleTop">
@@ -172,13 +143,6 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="de.danoeh.antennapod.activity.MainActivity"/>
         </activity>
-        <activity
-            android:name=".activity.DownloadLogActivity"
-            android:label="@string/download_log_label">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="de.danoeh.antennapod.activity.DownloadActivity"/>
-        </activity>
 
         <receiver
             android:name=".receiver.MediaButtonReceiver"
@@ -190,10 +154,6 @@
                 <action android:name="de.danoeh.antennapod.NOTIFY_BUTTON_RECEIVER"/>
             </intent-filter>
         </receiver>
-
-        <activity android:name=".activity.FeedInfoActivity">
-        </activity>
-
         <service
             android:name=".service.playback.PlayerWidgetService"
             android:enabled="true"
@@ -285,46 +245,7 @@
             android:name=".activity.OpmlFeedChooserActivity"
             android:label="@string/opml_import_label">
         </activity>
-        <activity
-            android:name=".activity.MiroGuideMainActivity"
-            android:label="@string/miro_guide_label">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="de.danoeh.antennapod.activity.AddFeedActivity"/>
-            <meta-data
-                android:name="android.app.default_searchable"
-                android:value="de.danoeh.antennapod.activity.MiroGuideSearchActivity"/>
-            <meta-data
-                android:name="android.app.searchable"
-                android:resource="@xml/miroguide_searchable"/>
-        </activity>
-        <activity
-            android:name=".activity.MiroGuideSearchActivity"
-            android:configChanges="keyboardHidden|orientation"
-            android:launchMode="singleTop">
-            <intent-filter>
-                <action android:name="android.intent.action.SEARCH"/>
-            </intent-filter>
 
-            <meta-data
-                android:name="android.app.searchable"
-                android:resource="@xml/miroguide_searchable"/>
-        </activity>
-        <activity
-            android:name=".activity.MiroGuideCategoryActivity"
-            android:configChanges="keyboardHidden|orientation">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="de.danoeh.antennapod.activity.MiroGuideMainActivity"/>
-        </activity>
-        <activity
-            android:name=".activity.MiroGuideChannelViewActivity"
-            android:configChanges="keyboard|orientation"
-            android:label="@string/miro_guide_label">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="de.danoeh.antennapod.activity.MiroGuideCategoryActivity"/>
-        </activity>
         <activity
             android:name=".activity.VideoplayerActivity"
             android:configChanges="keyboardHidden|orientation"
@@ -342,17 +263,6 @@
                 <data android:mimeType="video/*"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name=".activity.PlaybackHistoryActivity"
-            android:label="@string/playback_history_label">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="de.danoeh.antennapod.activity.MainActivity"/>
-        </activity>
-
-        <meta-data
-            android:name="android.support.PARENT_ACTIVITY"
-            android:value="de.danoeh.antennapod.activity.MainActiviy"/>
         <activity
             android:name=".activity.DirectoryChooserActivity"
             android:label="@string/choose_data_directory">
@@ -364,61 +274,6 @@
             android:name="android.support.PARENT_ACTIVITY"
             android:value="de.danoeh.antennapod.activity.PreferenceActivity"/>
 
-        <activity
-            android:name=".activity.OrganizeQueueActivity"
-            android:configChanges="orientation"
-            android:label="@string/organize_queue_label">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="de.danoeh.antennapod.activity.MainActivity"/>
-        </activity>
-        <activity
-            android:name=".activity.gpoddernet.GpodnetMainActivity"
-            android:configChanges="orientation"
-            android:label="@string/gpodnet_main_label">
-
-            <meta-data
-                android:name="android.app.default_searchable"
-                android:value="de.danoeh.antennapod.activity.gpoddernet.GpodnetSearchActivity"/>
-            <meta-data
-                android:name="android.app.searchable"
-                android:resource="@xml/gpodnet_searchable"/>
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="de.danoeh.antennapod.activity.AddFeedActivity"/>
-
-        </activity>
-        <activity
-            android:name=".activity.gpoddernet.GpodnetTagActivity"
-            android:configChanges="orientation">
-            <meta-data
-                android:name="android.app.default_searchable"
-                android:value="de.danoeh.antennapod.activity.gpoddernet.GpodnetSearchActivity"/>
-            <meta-data
-                android:name="android.app.searchable"
-                android:resource="@xml/gpodnet_searchable"/>
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="de.danoeh.antennapod.activity.gpoddernet.GpodnetMainActivity"/>
-        </activity>
-
-        <activity
-            android:name=".activity.gpoddernet.GpodnetSearchActivity"
-            android:configChanges="orientation"
-            android:label="@string/search_label"
-            android:launchMode="singleTop">
-            <intent-filter>
-                <action android:name="android.intent.action.SEARCH"/>
-            </intent-filter>
-
-            <meta-data
-                android:name="android.app.searchable"
-                android:resource="@xml/gpodnet_searchable"/>
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="de.danoeh.antennapod.activity.gpoddernet.GpodnetMainActivity"/>
-        </activity>
-
         <activity
             android:name=".activity.DefaultOnlineFeedViewActivity"
             android:configChanges="orientation"/>
diff --git a/src/de/danoeh/antennapod/activity/MainActivity.java b/src/de/danoeh/antennapod/activity/MainActivity.java
index d9a9cc40b..39e050079 100644
--- a/src/de/danoeh/antennapod/activity/MainActivity.java
+++ b/src/de/danoeh/antennapod/activity/MainActivity.java
@@ -280,8 +280,10 @@ public class MainActivity extends ActionBarActivity {
         EventDistributor.getInstance().register(contentUpdate);
 
         Intent intent = getIntent();
-        if (StringUtils.equals(intent.getAction(), Intent.ACTION_SEND)) {
-            String extra = intent.getStringExtra(Intent.EXTRA_TEXT);
+        if (StringUtils.equals(intent.getAction(), Intent.ACTION_SEND)
+                || StringUtils.equals(intent.getAction(), Intent.ACTION_VIEW)) {
+            String extra = (StringUtils.equals(intent.getAction(), Intent.ACTION_SEND))
+                    ? intent.getStringExtra(Intent.EXTRA_TEXT) : intent.getDataString();
             if (extra != null) {
                 Bundle args = new Bundle();
                 args.putString(AddFeedFragment.ARG_FEED_URL, extra);