diff --git a/res/values/non_localizable_strings.xml b/res/values/non_localizable_strings.xml
index 84ba4485b..88551ea41 100644
--- a/res/values/non_localizable_strings.xml
+++ b/res/values/non_localizable_strings.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+	<string name="pref_audio_use_specific_mode_key">pref_audio_use_specific_mode_key</string>
+	<string name="pref_audio_hacks_use_galaxys_hack_key">pref_audio_hacks_use_galaxys_hack_key</string>
+	<string name="pref_audio_hacks_use_routing_api_key">pref_audio_hacks_use_routing_api_key</string>
 	<string name="pref_audio_soft_volume_key">pref_audio_soft_volume_key</string>
 
 	<string name="pref_ipv6_key">pref_ipv6_key</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index adc83a94c..dd5edf359 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+	<string name="pref_audio_hacks_title">Audio hacks</string>
+	<string name="pref_audio_use_specific_mode_title">Use specific mode hack</string>
+	<string name="pref_audio_use_specific_mode_summary">0=MODE_NORMAL (default), 2=MODE_IN_CALL</string>
+	<string name="pref_audio_hacks_use_routing_api_title">Use routing API hack</string>
+	<string name="pref_audio_hacks_use_galaxys_hack_title">Use Galaxy S audio hack</string>
+
 	<string name="pref_audio_soft_volume_title">Use software volume</string>
 
 	<string name="pref_ipv6_title">Use ipv6 instead of ipv4</string>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 028666276..b468f3ed4 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -135,6 +135,18 @@
 			<CheckBoxPreference android:key="@string/pref_transport_use_standard_ports_key"
 				 android:title="@string/pref_transport_use_standard_ports"/>
 		</PreferenceScreen>
+
+		<PreferenceScreen android:title="@string/pref_audio_hacks_title"
+			android:layout="@layout/hidden">
+			<CheckBoxPreference android:key="@string/pref_audio_hacks_use_routing_api_key"
+			  android:title="@string/pref_audio_hacks_use_routing_api_title" />
+			 <CheckBoxPreference android:key="@string/pref_audio_hacks_use_galaxys_hack_key"
+			  android:title="@string/pref_audio_hacks_use_galaxys_hack_title" />
+			 <EditTextPreference android:key="@string/pref_audio_use_specific_mode_key"
+			  android:title="@string/pref_audio_use_specific_mode_title"
+			  android:summary="@string/pref_audio_use_specific_mode_summary"
+			  android:defaultValue="0" android:numeric="integer" />
+		</PreferenceScreen>
 	</PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 49d2b8bdd..bf64c59a9 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -18,6 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 package org.linphone;
 
+import static android.media.AudioManager.ROUTE_EARPIECE;
 import static android.media.AudioManager.MODE_IN_CALL;
 import static android.media.AudioManager.MODE_NORMAL;
 import static android.media.AudioManager.MODE_RINGTONE;
@@ -111,6 +112,7 @@ public final class LinphoneManager implements LinphoneCoreListener {
 	private LinphoneCore mLc;
 	private int mPhoneOrientation;
 	private static Transports initialTransports;
+	private static LinphonePreferenceManager lpm = LinphonePreferenceManager.getInstance();
 
 
 	
@@ -171,14 +173,38 @@ public final class LinphoneManager implements LinphoneCoreListener {
 	private boolean hasCamera;
 
 
+	private synchronized void routeAudioToSpeakerHelper(boolean speakerOn) {
+		LinphoneCall call = mLc.getCurrentCall();
+		boolean paused = false;
+		if (call != null && call.getState() == State.StreamsRunning && Hacks.needPausingCallForSpeakers()) {
+			Log.d(TAG, "Hack pausing call to have speaker="+speakerOn);
+			mLc.pauseCall(call);
+			paused = true;
+		}
+
+		if (Hacks.needGalaxySAudioHack() || lpm.useGalaxySHack())
+			setAudioModeIncallForGalaxyS();
+
+		if (lpm.useSpecificAudioModeHack() != -1)
+			mAudioManager.setMode(lpm.useSpecificAudioModeHack());
+
+		if (Hacks.needRoutingAPI() || lpm.useAudioRoutingAPIHack()) {
+			mAudioManager.setRouting(
+					MODE_NORMAL,
+					speakerOn? ROUTE_SPEAKER : ROUTE_EARPIECE,
+					AudioManager.ROUTE_ALL);
+		} else {
+			mAudioManager.setSpeakerphoneOn(speakerOn); 
+		}
+
+		if (paused) {
+			Log.d(TAG, "Hack resuming call to have speaker="+speakerOn);
+			mLc.resumeCall(call);
+		}
+	}
 	
 	public void routeAudioToSpeaker() {
-		if (Integer.parseInt(Build.VERSION.SDK) <= 4 /*<donut*/) {
-			mAudioManager.setRouting(MODE_NORMAL, 
-			AudioManager.ROUTE_SPEAKER, AudioManager.ROUTE_ALL);
-		} else {
-			mAudioManager.setSpeakerphoneOn(true); 
-		}
+		routeAudioToSpeakerHelper(true);
 		if (mLc.isIncall()) {
 			/*disable EC*/  
 			mLc.getCurrentCall().enableEchoCancellation(false);
@@ -188,13 +214,7 @@ public final class LinphoneManager implements LinphoneCoreListener {
 	}
 
 	public void routeAudioToReceiver() {
-		if (Integer.parseInt(Build.VERSION.SDK) <=4 /*<donut*/) {
-			mAudioManager.setRouting(MODE_NORMAL, 
-			AudioManager.ROUTE_EARPIECE, AudioManager.ROUTE_ALL);
-		} else {
-			mAudioManager.setSpeakerphoneOn(false); 
-		}
-		
+		routeAudioToSpeakerHelper(false);
 		if (mLc.isIncall()) {
 			//Restore default value
 			mLc.getCurrentCall().enableEchoCancellation(mLc.isEchoCancellationEnabled());
@@ -689,7 +709,7 @@ public final class LinphoneManager implements LinphoneCoreListener {
 		if (mCurrentCallState == IncomingReceived) { 
 			//previous state was ringing, so stop ringing
 			stopRinging();
-			//routeAudioToReceiver();
+			routeAudioToReceiver();
 		}
 		
 		if (state == CallEnd || state == Error) {
@@ -769,9 +789,7 @@ public final class LinphoneManager implements LinphoneCoreListener {
 			mVibrator.cancel();
 		}
 
-		if (Hacks.needGalaxySAudioHack()) {
-			mAudioManager.setMode(MODE_IN_CALL);
-		}
+		// You may need to call galaxys audio hack after this method
 	}
 
 	
@@ -802,16 +820,8 @@ public final class LinphoneManager implements LinphoneCoreListener {
 	}
 
 	public void setAudioModeIncallForGalaxyS() {
-		if (!Hacks.needGalaxySAudioHack()) return;
-
-		try {
-			stopRinging();
-			Thread.sleep(100);
-			mAudioManager.setMode(AudioManager.MODE_IN_CALL);
-			Thread.sleep(100);
-		} catch (InterruptedException e) {
-			/* ops */
-		}
+		stopRinging();
+		mAudioManager.setMode(MODE_IN_CALL);
 	}
 
 	// Called on first launch only
@@ -852,7 +862,9 @@ public final class LinphoneManager implements LinphoneCoreListener {
 	}
 
 	public boolean acceptCallIfIncomingPending() throws LinphoneCoreException {
-		setAudioModeIncallForGalaxyS();
+		if (Hacks.needGalaxySAudioHack() || lpm.useGalaxySHack())
+			setAudioModeIncallForGalaxyS();
+		
 		if (mLc.isInComingInvitePending()) {
 			mLc.acceptCall(mLc.getCurrentCall());
 			return true;
diff --git a/src/org/linphone/LinphonePreferenceManager.java b/src/org/linphone/LinphonePreferenceManager.java
index 484331bf7..7965bf93c 100644
--- a/src/org/linphone/LinphonePreferenceManager.java
+++ b/src/org/linphone/LinphonePreferenceManager.java
@@ -51,4 +51,18 @@ public class LinphonePreferenceManager {
 		return p.getBoolean(
 				getString(R.string.pref_audio_soft_volume_key), false);
 	}
+
+	public boolean useAudioRoutingAPIHack() {
+		return p.getBoolean(
+				getString(R.string.pref_audio_hacks_use_routing_api_key), false);
+	}
+
+	public boolean useGalaxySHack() {
+		return p.getBoolean(
+				getString(R.string.pref_audio_hacks_use_galaxys_hack_key), false);
+	}
+
+	public int useSpecificAudioModeHack() {
+		return Integer.parseInt(p.getString(getString(R.string.pref_audio_use_specific_mode_key), "0"));
+	}
 }
diff --git a/src/org/linphone/LinphoneService.java b/src/org/linphone/LinphoneService.java
index 16703fc43..1165cd1c8 100644
--- a/src/org/linphone/LinphoneService.java
+++ b/src/org/linphone/LinphoneService.java
@@ -100,6 +100,8 @@ public final class LinphoneService extends Service implements LinphoneServiceLis
 		super.onCreate();
 		instance = this;
 		
+		LinphonePreferenceManager.setContext(this); // In case restart after a crash . Main in LinphoneActivity
+
 		// Set default preferences
 		PreferenceManager.setDefaultValues(this, R.xml.preferences, true);
 
@@ -233,7 +235,7 @@ public final class LinphoneService extends Service implements LinphoneServiceLis
 		} else if (state == LinphoneCall.State.StreamsRunning) {
 			if (LinphoneActivity.isInstanciated()
 					&& getResources().getBoolean(R.bool.use_video_activity)
-					&& LinphoneManager.getLc().getCurrentCall().getCurrentParamsCopy().getVideoEnabled()) {
+					&& call.getCurrentParamsCopy().getVideoEnabled()) {
 				LinphoneActivity.instance().startVideoActivity();
 			}
 		}
diff --git a/src/org/linphone/core/Hacks.java b/src/org/linphone/core/Hacks.java
index 0eea6a814..5459bbd4b 100644
--- a/src/org/linphone/core/Hacks.java
+++ b/src/org/linphone/core/Hacks.java
@@ -30,9 +30,6 @@ public final class Hacks {
 		return isGT9000() || isSC02B();
 	}
 
-	public static boolean needGalaxySAudioHack() {
-		return isGalaxySOrTab();
-	}
 
 	public static boolean isGalaxySOrTabWithFrontCamera() {
 		return isGalaxySOrTab() && !isGalaxySOrTabWithoutFrontCamera();
@@ -93,10 +90,23 @@ public final class Hacks {
 		//sb.append("MANUFACTURER=").append(Build.MANUFACTURER).append("\n");
 		sb.append("SDK=").append(Build.VERSION.SDK);
 
-		Log.d(Version.TAG, sb.toString());
+		Log.i(Version.TAG, sb.toString());
 	}
 
 	public static boolean needSoftvolume() {
 		return isGalaxySOrTab();
 	}
+
+	public static boolean needRoutingAPI() {
+		return Version.sdkStrictlyBelow(5) /*<donut*/;
+	}
+
+	public static boolean needGalaxySAudioHack() {
+		return isGalaxySOrTab() && !isSC02B();
+	}
+
+	public static boolean needPausingCallForSpeakers() {
+//		return false;
+		return isGalaxySOrTab() && !isSC02B();
+	}
 }
diff --git a/src/org/linphone/core/LinphoneCoreImpl.java b/src/org/linphone/core/LinphoneCoreImpl.java
index 9b374c0f8..32052f143 100644
--- a/src/org/linphone/core/LinphoneCoreImpl.java
+++ b/src/org/linphone/core/LinphoneCoreImpl.java
@@ -96,7 +96,9 @@ class LinphoneCoreImpl implements LinphoneCore {
 	private native void setSignalingTransportPorts(long nativePtr, int udp, int tcp, int tls);
 	private native void enableIpv6(long nativePtr,boolean enable);
 	private native void adjustSoftwareVolume(long nativePtr,int db);
-
+	private native int pauseCall(long nativePtr, long callPtr);
+	private native int pauseAllCalls(long nativePtr);
+	private native int resumeCall(long nativePtr, long callPtr);
 	LinphoneCoreImpl(LinphoneCoreListener listener, File userConfig,File factoryConfig,Object  userdata) throws IOException {
 		mListener=listener;
 		nativePtr = newLinphoneCore(listener,userConfig.getCanonicalPath(),factoryConfig.getCanonicalPath(),userdata);
@@ -472,4 +474,13 @@ class LinphoneCoreImpl implements LinphoneCore {
 		adjustSoftwareVolume(nativePtr, i);
 	}
 
+	public synchronized boolean pauseCall(LinphoneCall call) {
+		return 0 == pauseCall(nativePtr, ((LinphoneCallImpl) call).nativePtr);
+	}
+	public synchronized boolean resumeCall(LinphoneCall call) {
+		return 0 == resumeCall(nativePtr, ((LinphoneCallImpl) call).nativePtr);
+	}
+	public synchronized boolean pauseAllCalls() {
+		return 0 == pauseAllCalls(nativePtr);
+	}
 }
diff --git a/src/org/linphone/ui/MuteMicButton.java b/src/org/linphone/ui/MuteMicButton.java
index c364d1eab..42c35bdd0 100644
--- a/src/org/linphone/ui/MuteMicButton.java
+++ b/src/org/linphone/ui/MuteMicButton.java
@@ -41,15 +41,12 @@ public class MuteMicButton extends ToggleImageButton implements OnCheckedChangeL
 	}
 
 	public void setMicMuted(boolean state) {
-		setChecked(state);
+		if (state != isChecked())
+			setChecked(state);
 	}
 
 
 	public void onCheckedChanged(ToggleImageButton button, boolean checked) {
-		if (checked) {
-			LinphoneManager.getLc().muteMic(true);
-		} else {
-			LinphoneManager.getLc().muteMic(false);
-		}
+		LinphoneManager.getLc().muteMic(checked);
 	}
 }
diff --git a/src/org/linphone/ui/SpeakerButton.java b/src/org/linphone/ui/SpeakerButton.java
index f15ec6782..35d2beb1b 100644
--- a/src/org/linphone/ui/SpeakerButton.java
+++ b/src/org/linphone/ui/SpeakerButton.java
@@ -41,7 +41,8 @@ public class SpeakerButton extends ToggleImageButton implements OnCheckedChangeL
 	}
 
 	public void setSpeakerOn(boolean state) {
-		setChecked(state);
+		if (state != isChecked())
+			setChecked(state);
 	}
 
 
diff --git a/submodules/linphone b/submodules/linphone
index ed8a2f44d..adc783813 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit ed8a2f44d51c9a2c10fe0f531b4f7a2640aaa68c
+Subproject commit adc7838132946ce02074d686dd581eb86a468228