diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 013c965e3..5e1ec8641 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -25,7 +25,7 @@
 
     <application
         android:name="de.danoeh.antennapod.PodcastApp"
-        android:debuggable="false"
+        android:debuggable="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:logo="@drawable/ic_launcher"
diff --git a/src/de/danoeh/antennapod/activity/MediaplayerActivity.java b/src/de/danoeh/antennapod/activity/MediaplayerActivity.java
index 39f30c95e..0e7ddc479 100644
--- a/src/de/danoeh/antennapod/activity/MediaplayerActivity.java
+++ b/src/de/danoeh/antennapod/activity/MediaplayerActivity.java
@@ -52,7 +52,7 @@ public abstract class MediaplayerActivity extends SherlockFragmentActivity
 
 	public MediaplayerActivity() {
 		super();
-		controller = new PlaybackController(this) {
+		controller = new PlaybackController(this, false) {
 
 			@Override
 			public void setupGUI() {
@@ -151,6 +151,7 @@ public abstract class MediaplayerActivity extends SherlockFragmentActivity
 	@Override
 	protected void onPause() {
 		super.onPause();
+		controller.reinitServiceIfPaused();
 		controller.pause();
 	}
 
diff --git a/src/de/danoeh/antennapod/feed/FeedManager.java b/src/de/danoeh/antennapod/feed/FeedManager.java
index ba9abfe83..d4b1c0bfa 100644
--- a/src/de/danoeh/antennapod/feed/FeedManager.java
+++ b/src/de/danoeh/antennapod/feed/FeedManager.java
@@ -133,6 +133,7 @@ public class FeedManager {
 				startWhenPrepared);
 		launchIntent
 				.putExtra(PlaybackService.EXTRA_SHOULD_STREAM, shouldStream);
+		launchIntent.putExtra(PlaybackService.EXTRA_PREPARE_IMMEDIATELY, true);
 		context.startService(launchIntent);
 		if (showPlayer) {
 			// Launch Mediaplayer
diff --git a/src/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java b/src/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
index 61cafca54..d79b7de10 100644
--- a/src/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
+++ b/src/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
@@ -78,7 +78,7 @@ public class ExternalPlayerFragment extends SherlockFragment {
 	}
 
 	private PlaybackController setupPlaybackController() {
-		return new PlaybackController(getActivity()) {
+		return new PlaybackController(getActivity(), true) {
 
 			@Override
 			public void setupGUI() {
diff --git a/src/de/danoeh/antennapod/service/PlaybackService.java b/src/de/danoeh/antennapod/service/PlaybackService.java
index 47cbeff2b..48a1f4d41 100644
--- a/src/de/danoeh/antennapod/service/PlaybackService.java
+++ b/src/de/danoeh/antennapod/service/PlaybackService.java
@@ -337,7 +337,7 @@ public class PlaybackService extends Service {
 			case AudioManager.AUDIOFOCUS_LOSS:
 				if (AppConfig.DEBUG)
 					Log.d(TAG, "Lost audio focus");
-				pause(true);
+				pause(true, true);
 				stopSelf();
 				break;
 			case AudioManager.AUDIOFOCUS_GAIN:
@@ -362,7 +362,7 @@ public class PlaybackService extends Service {
 				if (status == PlayerStatus.PLAYING) {
 					if (AppConfig.DEBUG)
 						Log.d(TAG, "Lost audio focus temporarily. Pausing...");
-					pause(false);
+					pause(false, false);
 					pausedBecauseOfTransientAudiofocusLoss = true;
 				}
 			}
@@ -394,7 +394,7 @@ public class PlaybackService extends Service {
 				// check if already playing and playbackType is the same
 			} else if (media == null || mediaId != media.getId()
 					|| playbackType != shouldStream) {
-				pause(true);
+				pause(true, false);
 				player.reset();
 				sendNotificationBroadcast(NOTIFICATION_TYPE_RELOAD, 0);
 				if (media == null || mediaId != media.getId()) {
@@ -406,7 +406,8 @@ public class PlaybackService extends Service {
 					shouldStream = playbackType;
 					startWhenPrepared = intent.getBooleanExtra(
 							EXTRA_START_WHEN_PREPARED, false);
-					prepareImmediately = intent.getBooleanExtra(EXTRA_PREPARE_IMMEDIATELY, false);
+					prepareImmediately = intent.getBooleanExtra(
+							EXTRA_PREPARE_IMMEDIATELY, false);
 					initMediaplayer();
 
 				} else {
@@ -435,21 +436,27 @@ public class PlaybackService extends Service {
 		case KeyEvent.KEYCODE_HEADSETHOOK:
 		case KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE:
 			if (status == PlayerStatus.PLAYING) {
-				pause(false);
+				pause(false, true);
 			} else if (status == PlayerStatus.PAUSED) {
 				play();
 			} else if (status == PlayerStatus.PREPARING) {
 				setStartWhenPrepared(!startWhenPrepared);
+			} else if (status == PlayerStatus.INITIALIZED) {
+				startWhenPrepared = true;
+				prepare();
 			}
 			break;
 		case KeyEvent.KEYCODE_MEDIA_PLAY:
 			if (status == PlayerStatus.PAUSED) {
 				play();
+			} else if (status == PlayerStatus.INITIALIZED) {
+				startWhenPrepared = true;
+				prepare();
 			}
 			break;
 		case KeyEvent.KEYCODE_MEDIA_PAUSE:
 			if (status == PlayerStatus.PLAYING) {
-				pause(false);
+				pause(false, true);
 			}
 			break;
 		}
@@ -647,7 +654,7 @@ public class PlaybackService extends Service {
 		public boolean onError(MediaPlayer mp, int what, int extra) {
 			Log.w(TAG, "An error has occured: " + what);
 			if (mp.isPlaying()) {
-				pause(true);
+				pause(true, true);
 			}
 			sendNotificationBroadcast(NOTIFICATION_TYPE_ERROR, what);
 			stopSelf();
@@ -699,12 +706,12 @@ public class PlaybackService extends Service {
 				media = nextItem.getMedia();
 				feed = nextItem.getFeed();
 				shouldStream = !media.isDownloaded();
-				startWhenPrepared = true;
+				prepareImmediately = startWhenPrepared = true;
 			} else {
 				if (AppConfig.DEBUG)
 					Log.d(TAG,
 							"No more episodes available to play; Reloading current episode");
-				startWhenPrepared = false;
+				prepareImmediately = startWhenPrepared = false;
 				stopForeground(true);
 				stopWidgetUpdater();
 			}
@@ -758,8 +765,10 @@ public class PlaybackService extends Service {
 	 * 
 	 * @param abandonFocus
 	 *            is true if the service should release audio focus
+	 * @param reset
+	 *            is true if service should reinit after pausing if the media file is being streamed
 	 */
-	public void pause(boolean abandonFocus) {
+	public void pause(boolean abandonFocus, boolean reinit) {
 		if (player.isPlaying()) {
 			if (AppConfig.DEBUG)
 				Log.d(TAG, "Pausing playback.");
@@ -773,6 +782,9 @@ public class PlaybackService extends Service {
 			setStatus(PlayerStatus.PAUSED);
 			stopWidgetUpdater();
 			stopForeground(true);
+			if (shouldStream && reinit) {
+				reinit();
+			}
 		}
 	}
 
@@ -1001,6 +1013,7 @@ public class PlaybackService extends Service {
 							.setPlaybackState(RemoteControlClient.PLAYSTATE_PLAYING);
 					break;
 				case PAUSED:
+				case INITIALIZED:
 					remoteControlClient
 							.setPlaybackState(RemoteControlClient.PLAYSTATE_PAUSED);
 					break;
@@ -1062,7 +1075,7 @@ public class PlaybackService extends Service {
 						if (AppConfig.DEBUG)
 							Log.d(TAG,
 									"Pausing playback because headset was disconnected");
-						pause(false);
+						pause(false, true);
 					}
 				} else {
 					Log.e(TAG, "Received invalid ACTION_HEADSET_PLUG intent");
@@ -1145,7 +1158,7 @@ public class PlaybackService extends Service {
 						if (status == PlayerStatus.PLAYING) {
 							if (AppConfig.DEBUG)
 								Log.d(TAG, "Pausing playback");
-							pause(true);
+							pause(true, true);
 						}
 						postExecute();
 					}
diff --git a/src/de/danoeh/antennapod/util/PlaybackController.java b/src/de/danoeh/antennapod/util/PlaybackController.java
index f29f42707..bf3eaa706 100644
--- a/src/de/danoeh/antennapod/util/PlaybackController.java
+++ b/src/de/danoeh/antennapod/util/PlaybackController.java
@@ -57,8 +57,15 @@ public abstract class PlaybackController {
 	private boolean mediaInfoLoaded = false;
 	private boolean released = false;
 
-	public PlaybackController(Activity activity) {
+	/**
+	 * True if controller should reinit playback service if 'pause' button is
+	 * pressed.
+	 */
+	private boolean reinitOnPause;
+
+	public PlaybackController(Activity activity, boolean reinitOnPause) {
 		this.activity = activity;
+		this.reinitOnPause = reinitOnPause;
 		schedExecutor = new ScheduledThreadPoolExecutor(SCHED_EX_POOLSIZE,
 				new ThreadFactory() {
 
@@ -134,7 +141,7 @@ public abstract class PlaybackController {
 	public void pause() {
 		mediaInfoLoaded = false;
 		if (playbackService != null && playbackService.isPlayingVideo()) {
-			playbackService.pause(true);
+			playbackService.pause(true, true);
 		}
 	}
 
@@ -186,6 +193,8 @@ public abstract class PlaybackController {
 			serviceIntent.putExtra(PlaybackService.EXTRA_MEDIA_ID, mediaId);
 			serviceIntent.putExtra(PlaybackService.EXTRA_START_WHEN_PREPARED,
 					false);
+			serviceIntent.putExtra(PlaybackService.EXTRA_PREPARE_IMMEDIATELY,
+					false);
 			serviceIntent
 					.putExtra(PlaybackService.EXTRA_SHOULD_STREAM, prefs
 							.getBoolean(PlaybackService.PREF_LAST_IS_STREAM,
@@ -388,6 +397,11 @@ public abstract class PlaybackController {
 		case AWAITING_VIDEO_SURFACE:
 			onAwaitingVideoSurface();
 			break;
+		case INITIALIZED:
+			checkMediaInfoLoaded();
+			clearStatusMsg();
+			updatePlayButtonAppearance(R.drawable.av_play);
+			break;
 		}
 	}
 
@@ -488,7 +502,7 @@ public abstract class PlaybackController {
 				if (playbackService != null) {
 					switch (status) {
 					case PLAYING:
-						playbackService.pause(true);
+						playbackService.pause(true, reinitOnPause);
 						break;
 					case PAUSED:
 					case PREPARED:
@@ -497,6 +511,15 @@ public abstract class PlaybackController {
 					case PREPARING:
 						playbackService.setStartWhenPrepared(!playbackService
 								.isStartWhenPrepared());
+						if (reinitOnPause
+								&& playbackService.isStartWhenPrepared() == false) {
+							playbackService.reinit();
+						}
+						break;
+					case INITIALIZED:
+						playbackService.setStartWhenPrepared(true);
+						playbackService.prepare();
+						break;
 					}
 				} else {
 					Log.w(TAG,
@@ -610,6 +633,17 @@ public abstract class PlaybackController {
 		}
 	}
 
+	/** Move service into INITIALIZED state if it's paused to save bandwidth */
+	public void reinitServiceIfPaused() {
+		if (playbackService != null
+				&& playbackService.isShouldStream()
+				&& (playbackService.getStatus() == PlayerStatus.PAUSED || (playbackService
+						.getStatus() == PlayerStatus.PREPARING && playbackService
+						.isStartWhenPrepared() == false))) {
+			playbackService.reinit();
+		}
+	}
+
 	/** Refreshes the current position of the media file that is playing. */
 	public class MediaPositionObserver implements Runnable {