diff --git a/src/org/linphone/CallActivity.java b/src/org/linphone/CallActivity.java
index 8b63cd8fd..06558d7da 100644
--- a/src/org/linphone/CallActivity.java
+++ b/src/org/linphone/CallActivity.java
@@ -1235,7 +1235,9 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
 			mControlsHandler.removeCallbacks(mControls);
 		}
 		mControls = null;
-		enableProximitySensing(false);
+		// Workaround for proximity sensor bug on Samsung devices
+		if (lc.getCurrentCall() != null && lc.getCurrentCall().getState() != State.StreamsRunning)
+			enableProximitySensing(false);
 	}
 
 	@Override
@@ -1546,7 +1548,7 @@ public class CallActivity extends LinphoneGenericActivity implements OnClickList
 
 		final float distanceInCm = event.values[0];
 		final float maxDistance = event.sensor.getMaximumRange();
-		Log.d("Proximity sensor report [",distanceInCm,"] , for max range [",maxDistance,"]");
+		Log.d("Proximity sensor report ["+distanceInCm+"] , for max range ["+maxDistance+"]");
 
 		if (maxDistance <= threshold) {
 			// Case binary 0/1 and short sensors
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index bda409ea6..842c5ec84 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -1096,8 +1096,8 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
 			}
 		} else if (resultCode == Activity.RESULT_FIRST_USER && requestCode == CALL_ACTIVITY) {
 			getIntent().putExtra("PreviousActivity", CALL_ACTIVITY);
-			callTransfer = data == null ? false : data.getBooleanExtra("Transfer", false);
-			boolean chat = data == null ? false : data.getBooleanExtra("chat", false);
+			callTransfer = data != null && data.getBooleanExtra("Transfer", false);
+			boolean chat = data != null && data.getBooleanExtra("chat", false);
 			if(chat){
 				pendingFragmentTransaction = FragmentsAvailable.CHAT_LIST;
 			}