diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4e73fb38a..5efc5929c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -123,8 +123,10 @@
 	<receiver android:name="org.linphone.BootReceiver">
 		<intent-filter><action android:name="android.intent.action.BOOT_COMPLETED"></action></intent-filter>
 	</receiver>
-	
-	
+
+	<receiver android:name="org.linphone.PhoneStateChangedReceiver">
+		<intent-filter><action android:name="android.intent.action.PHONE_STATE" /></intent-filter>
+	</receiver>
 	
 	
 		<activity android:name="org.linphone.TestConferenceActivity"
@@ -201,6 +203,7 @@
 <uses-permission android:name="android.permission.CAMERA" />
 <uses-permission android:name="android.permission.READ_LOGS" />
 
+<uses-permission android:name="android.permission.READ_PHONE_STATE" />
 
 <supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:anyDensity="true"/>
 </manifest> 
diff --git a/src/org/linphone/ConferenceActivity.java b/src/org/linphone/ConferenceActivity.java
index 79f0ad409..f975a1904 100644
--- a/src/org/linphone/ConferenceActivity.java
+++ b/src/org/linphone/ConferenceActivity.java
@@ -143,6 +143,9 @@ public class ConferenceActivity extends ListActivity implements
 		updateCalleeImage();
 		updateConfState();
 		updateSimpleControlButtons();
+		CalleeListAdapter adapter = (CalleeListAdapter) getListAdapter();
+		adapter.notifyDataSetInvalidated();
+		adapter.notifyDataSetChanged();
 	}
 
 	@Override
diff --git a/src/org/linphone/PhoneStateChangedReceiver.java b/src/org/linphone/PhoneStateChangedReceiver.java
new file mode 100644
index 000000000..c5125faa0
--- /dev/null
+++ b/src/org/linphone/PhoneStateChangedReceiver.java
@@ -0,0 +1,48 @@
+/*
+PhoneStateReceiver.java
+Copyright (C) 2011  Belledonne Communications, Grenoble, France
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+package org.linphone;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.telephony.TelephonyManager;
+
+/**
+ * Pause current SIP calls when GSM phone rings or is active.
+ * 
+ * @author Guillaume Beraudo
+ *
+ */
+public class PhoneStateChangedReceiver extends BroadcastReceiver {
+
+	@Override
+	public void onReceive(Context context, Intent intent) {
+		final String extraState = intent.getStringExtra(TelephonyManager.EXTRA_STATE);
+
+		if (TelephonyManager.EXTRA_STATE_RINGING.equals(extraState) || TelephonyManager.EXTRA_STATE_OFFHOOK.equals(extraState)) {
+			if (LinphoneManager.isInstanciated()) {
+				LinphoneManager.getLc().pauseAllCalls();
+			}
+        }
+		
+		// TelephonyManager.EXTRA_STATE_IDLE.equals(extraState)
+		// do nothing
+	}
+
+}