diff --git a/Classes/LinphoneAppDelegate.m b/Classes/LinphoneAppDelegate.m
index dc44c57e0..b7eeb00a2 100644
--- a/Classes/LinphoneAppDelegate.m
+++ b/Classes/LinphoneAppDelegate.m
@@ -121,9 +121,7 @@
 	
 	[[LinphoneManager instance] setCallDelegate:myPhoneViewController];
 	[[LinphoneManager instance]	startLibLinphone];
-	
-	[ [UIDevice currentDevice] setProximityMonitoringEnabled:true];
-	
+		
 	
 	
 	return YES;
diff --git a/Classes/PhoneViewController.m b/Classes/PhoneViewController.m
index 8b0efb8cc..0e1432f29 100644
--- a/Classes/PhoneViewController.m
+++ b/Classes/PhoneViewController.m
@@ -182,6 +182,9 @@
 	[hangup setEnabled:false];
 
 	[callDuration stop];
+    UIDevice *device = [UIDevice currentDevice];
+    device.proximityMonitoringEnabled = NO;
+
 	
 	[peerLabel setText:@""];
 	if ([[NSUserDefaults standardUserDefaults] boolForKey:@"firstlogindone_preference" ] == true) {
@@ -192,7 +195,13 @@
 	
 }
 -(void) displayIncalViewforUser:(NSString*) username withDisplayName:(NSString*) displayName {
-	[hangup setEnabled:true];
+    UIDevice *device = [UIDevice currentDevice];
+    device.proximityMonitoringEnabled = YES;
+    if (device.proximityMonitoringEnabled == YES) {
+        ms_message("Ok this device support proximity, and I just enabled it");
+    }
+
+    [hangup setEnabled:true];
 	if (displayName && [displayName length]>0) {
 		[peerLabel setText:displayName];
 	} else {