diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 90fc3e4c..4b10ee13 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -380,7 +380,6 @@
     <string name="enable">Enable</string>
     <string name="consider_disable_battery_optimizations">Consider disable battery optimizations</string>
     <string name="consider_enable_battery_optimizations">Consider enable battery optimizations</string>
-
-  <string name="no_transproxy_warning_short">WARNING: Transproxying no longer supported</string>
-  <string name="no_transproxy_warning">WARNING: Transparent proxying not supported. Use Orbot Apps VPN instead.</string>
+  <string name="pref_isolate_dest">Isolate destination addresses</string>
+  <string name="pref_isolate_dest_summary">Use a different circuit for each destination address</string>
 </resources>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 995fbbee..d08c3cc4 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -157,6 +157,15 @@ android:dialogTitle="@string/enter_ports"
 />
 </PreferenceCategory>
 
+<PreferenceCategory android:title="Isolation">
+<CheckBoxPreference
+android:key="pref_isolate_dest"
+android:defaultValue="false"
+android:title="@string/pref_isolate_dest"
+android:summary="@string/pref_isolate_dest_summary"
+android:enabled="true"></CheckBoxPreference>
+</PreferenceCategory>
+
 <PreferenceCategory android:title="@string/pref_proxy_title">
 <EditTextPreference android:key="pref_proxy_type"
 android:title="@string/pref_proxy_type_title"
diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotConstants.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotConstants.java
index 665cf0c6..175ebf81 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/OrbotConstants.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotConstants.java
@@ -33,5 +33,7 @@ public interface OrbotConstants {
 	public final static int MAX_LOG_LENGTH = 10000;
 	
 	public final static String PREF_SOCKS = "pref_socks";
-	
+
+	public final static String PREF_ISOLATE_DEST = "pref_isolate_dest";
+
 }
diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java
index 8e5a7495..10fa376f 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java
@@ -661,8 +661,14 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
 	        if (isPortUsed) //the specified port is not available, so let Tor find one instead
 	        	socksPortPref = "auto";
         }
+
+        String isolate = " ";
+        if(prefs.getBoolean(OrbotConstants.PREF_ISOLATE_DEST, false))
+        {
+            isolate += "IsolateDestAddr";
+        }
         
-        extraLines.append("SOCKSPort ").append(socksPortPref).append('\n');
+        extraLines.append("SOCKSPort ").append(socksPortPref).append(isolate).append('\n');
         extraLines.append("SafeSocks 0").append('\n');
         extraLines.append("TestSocks 0").append('\n');
         extraLines.append("WarnUnsafeSocks 1").append('\n');