diff --git a/core/res/menu/fragment_details.xml b/core/res/menu/fragment_details.xml
index 93623d57..d707fc48 100644
--- a/core/res/menu/fragment_details.xml
+++ b/core/res/menu/fragment_details.xml
@@ -32,7 +32,7 @@
 		android:id="@+id/action_start"
 		android:icon="?attr/ic_action_start"
 		android:showAsAction="ifRoom"
-		android:title="@string/action_start"
+		android:title="@string/action_start_default"
 		android:orderInCategory="202">
 		<menu>
 			<item android:id="@+id/action_start_default" android:title="@string/action_start_default" />
diff --git a/core/res/menu/fragment_torrents_cab.xml b/core/res/menu/fragment_torrents_cab.xml
index 80ffafc0..91fd0a8a 100644
--- a/core/res/menu/fragment_torrents_cab.xml
+++ b/core/res/menu/fragment_torrents_cab.xml
@@ -26,6 +26,16 @@
 		android:icon="?attr/ic_action_pause"
 		android:showAsAction="always"
 		android:title="@string/action_pause" />
+	<item
+		android:id="@+id/action_start"
+		android:icon="?attr/ic_action_start"
+		android:showAsAction="always"
+		android:title="@string/action_start" />
+	<item
+		android:id="@+id/action_stop"
+		android:icon="?attr/ic_action_stop"
+		android:showAsAction="always"
+		android:title="@string/action_stop" />
 	<item
 		android:id="@+id/action_remove"
 		android:icon="?attr/ic_action_remove"
diff --git a/core/src/org/transdroid/core/gui/TorrentsActivity.java b/core/src/org/transdroid/core/gui/TorrentsActivity.java
index 7d010b27..1741190c 100644
--- a/core/src/org/transdroid/core/gui/TorrentsActivity.java
+++ b/core/src/org/transdroid/core/gui/TorrentsActivity.java
@@ -225,7 +225,7 @@ public class TorrentsActivity extends SherlockFragmentActivity implements OnNavi
 			currentConnection = lastUsed.createServerAdapter(connectivityHelper.getConnectedNetworkName());
 			handleStartIntent();
 		}
-		
+
 		// Start the alarms for the background services, if needed
 		BootReceiver.startBackgroundServices(getApplicationContext(), false);
 		BootReceiver.startAppUpdatesService(getApplicationContext());
@@ -288,7 +288,7 @@ public class TorrentsActivity extends SherlockFragmentActivity implements OnNavi
 			menu.findItem(R.id.action_settings).setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
 			menu.findItem(R.id.action_help).setVisible(true);
 			if (fragmentTorrents != null)
-				fragmentTorrents.updateConnectionStatus(false);
+				fragmentTorrents.updateConnectionStatus(false, null);
 			getSupportActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
 			return true;
 		}
@@ -302,11 +302,12 @@ public class TorrentsActivity extends SherlockFragmentActivity implements OnNavi
 		menu.findItem(R.id.action_disableturtle).setVisible(hasAltMode && turleModeEnabled);
 		menu.findItem(R.id.action_refresh).setVisible(true);
 		menu.findItem(R.id.action_sort).setVisible(true);
+		menu.findItem(R.id.action_sort_added).setVisible(Daemon.supportsDateAdded(currentConnection.getType()));
 		menu.findItem(R.id.action_filter).setVisible(true);
 		menu.findItem(R.id.action_settings).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
 		menu.findItem(R.id.action_help).setVisible(false);
 		if (fragmentTorrents != null)
-			fragmentTorrents.updateConnectionStatus(true);
+			fragmentTorrents.updateConnectionStatus(true, currentConnection.getType());
 		getSupportActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
 
 		return true;
@@ -926,7 +927,7 @@ public class TorrentsActivity extends SherlockFragmentActivity implements OnNavi
 
 		lastNavigationLabels = Label.convertToNavigationLabels(labels,
 				getResources().getString(R.string.labels_unlabeled));
-		
+
 		// Report the newly retrieved list of torrents to the torrents fragment
 		fragmentTorrents.updateIsLoading(false);
 		fragmentTorrents.updateTorrents(new ArrayList<Torrent>(torrents), lastNavigationLabels);
diff --git a/core/src/org/transdroid/core/gui/TorrentsFragment.java b/core/src/org/transdroid/core/gui/TorrentsFragment.java
index 07eb9692..30dad2a8 100644
--- a/core/src/org/transdroid/core/gui/TorrentsFragment.java
+++ b/core/src/org/transdroid/core/gui/TorrentsFragment.java
@@ -84,6 +84,8 @@ public class TorrentsFragment extends SherlockFragment implements OnLabelPickedL
 	protected boolean isLoading = true;
 	@InstanceState
 	protected String connectionErrorMessage = null;
+	@InstanceState
+	protected Daemon daemonType;
 
 	// Views
 	@ViewById(resName = "torrent_list")
@@ -208,9 +210,9 @@ public class TorrentsFragment extends SherlockFragment implements OnLabelPickedL
 	}
 
 	private MultiChoiceModeListenerCompat onTorrentsSelected = new MultiChoiceModeListenerCompat() {
-		
+
 		SelectionManagerMode selectionManagerMode;
-		
+
 		@Override
 		public boolean onCreateActionMode(ActionMode mode, Menu menu) {
 			// Show contextual action bar to start/stop/remove/etc. torrents in batch mode
@@ -222,7 +224,14 @@ public class TorrentsFragment extends SherlockFragment implements OnLabelPickedL
 
 		@Override
 		public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
-			return selectionManagerMode.onPrepareActionMode(mode, menu);
+			selectionManagerMode.onPrepareActionMode(mode, menu);
+			// Hide/show options depending on the type of server we are connected to
+			if (daemonType != null) {
+				menu.findItem(R.id.action_start).setVisible(Daemon.supportsStoppingStarting(daemonType));
+				menu.findItem(R.id.action_stop).setVisible(Daemon.supportsStoppingStarting(daemonType));
+				menu.findItem(R.id.action_setlabel).setVisible(Daemon.supportsSetLabel(daemonType));
+			}
+			return true;
 		}
 
 		public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
@@ -248,6 +257,18 @@ public class TorrentsFragment extends SherlockFragment implements OnLabelPickedL
 				}
 				mode.finish();
 				return true;
+			} else if (itemId == R.id.action_start) {
+				for (Torrent torrent : checked) {
+					getTasksExecutor().startTorrent(torrent, false);
+				}
+				mode.finish();
+				return true;
+			} else if (itemId == R.id.action_stop) {
+				for (Torrent torrent : checked) {
+					getTasksExecutor().stopTorrent(torrent);
+				}
+				mode.finish();
+				return true;
 			} else if (itemId == R.id.action_remove_default) {
 				for (Torrent torrent : checked) {
 					getTasksExecutor().removeTorrent(torrent, false);
@@ -300,8 +321,9 @@ public class TorrentsFragment extends SherlockFragment implements OnLabelPickedL
 	 * need to show a message suggesting help). This should only ever be called on the UI thread.
 	 * @param hasAConnection True if the user has servers configured and therefore has a connection that can be used
 	 */
-	public void updateConnectionStatus(boolean hasAConnection) {
+	public void updateConnectionStatus(boolean hasAConnection, Daemon daemonType) {
 		this.hasAConnection = hasAConnection;
+		this.daemonType = daemonType;
 		if (!hasAConnection) {
 			clear(true, true); // Indirectly also calls updateViewVisibility()
 		} else {