diff --git a/res/values/non_localizable_strings.xml b/res/values/non_localizable_strings.xml
index 1aab74c9d..24b210f40 100644
--- a/res/values/non_localizable_strings.xml
+++ b/res/values/non_localizable_strings.xml
@@ -41,6 +41,8 @@
     <string name="pref_debug_key">pref_debug_key</string>
     <string name="first_launch_suceeded_once_key">first_launch_suceeded_once_key</string>
 
+    <string name="pref_wifi_only_key">pref_wifi_only_key</string>
+    
     <string name="pref_video_use_front_camera_key">pref_video_use_front_camera_key</string>
     <string name="pref_video_codec_h263_key">pref_video_codec_h263_key</string>
     <string name="pref_video_codec_mpeg4_key">pref_video_codec_mpeg4_key</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 438e4e3ff..6405a08a8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -235,6 +235,8 @@
 <string name="pref_default_account">pref_default_account</string>
 <string name="pref_sipaccounts">SIP Accounts</string>
 
+<string name="pref_wifi_only">Use wifi only</string>
+
 <string name="wizard_username_hint">Username</string>
 <string name="wizard_password_hint">Password</string>
 <string name="wizard_password_confirm_hint">Confirmation</string>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 3ea6bc3b5..53f16a8bf 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -175,6 +175,9 @@
 			 android:title="@string/pref_transport_tls" />
 			<CheckBoxPreference android:key="@string/pref_transport_use_standard_ports_key"
 				 android:title="@string/pref_transport_use_standard_ports"/>
+			
+			<CheckBoxPreference android:key="@string/pref_wifi_only_key"
+				 android:title="@string/pref_wifi_only"/>
 		</PreferenceScreen>
 		<ListPreference android:title="@string/pref_media_encryption"
 					android:key="@string/pref_media_encryption_key"
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index b8a748934..3b6430508 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -855,8 +855,15 @@ public final class LinphoneManager implements LinphoneCoreListener {
 			mLc.setNetworkReachable(false);
 		} else if (eventInfo.getState() == NetworkInfo.State.CONNECTED){
 			manageTunnelServer(activeInfo);
-			Log.i(eventInfo.getTypeName()," connected: setting network reachable");
-			mLc.setNetworkReachable(true);
+			SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(mServiceContext);
+			boolean wifiOnly = pref.getBoolean(getString(R.string.pref_wifi_only_key), false);
+			if (eventInfo.getTypeName().equals("WIFI") || (eventInfo.getTypeName().equals("mobile") && !wifiOnly)) {
+				mLc.setNetworkReachable(true);
+				Log.i(eventInfo.getTypeName()," connected: setting network reachable");
+			} else {
+				mLc.setNetworkReachable(false);
+				Log.i(eventInfo.getTypeName()," connected: wifi only activated, setting network unreachable");
+			}
 		}
 	}
 
diff --git a/src/org/linphone/NetworkManager.java b/src/org/linphone/NetworkManager.java
index 9714ceaed..5bca3c3db 100644
--- a/src/org/linphone/NetworkManager.java
+++ b/src/org/linphone/NetworkManager.java
@@ -23,8 +23,10 @@ import org.linphone.core.Log;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
+import android.preference.PreferenceManager;
 
 
 
@@ -52,7 +54,13 @@ public class NetworkManager extends BroadcastReceiver {
 		if (lNoConnectivity | ((lNetworkInfo.getState() == NetworkInfo.State.DISCONNECTED) /*&& !lIsFailOver*/)) {
 			LinphoneManager.getLc().setNetworkReachable(false);
 		} else if (lNetworkInfo.getState() == NetworkInfo.State.CONNECTED){
-			 LinphoneManager.getLc().setNetworkReachable(true);
+			SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(context);
+			boolean wifiOnly = pref.getBoolean(context.getString(R.string.pref_wifi_only_key), false);
+			if (lNetworkInfo.getTypeName().equals("WIFI") || (lNetworkInfo.getTypeName().equals("mobile") && !wifiOnly)) {
+				LinphoneManager.getLc().setNetworkReachable(true);
+			} else {
+				LinphoneManager.getLc().setNetworkReachable(false);
+			}
 		} else {
 			 // Other unhandled events
 		}