diff --git a/res/raw/linphonerc b/res/raw/linphonerc
index 53cfbce1d..c64658e33 100644
--- a/res/raw/linphonerc
+++ b/res/raw/linphonerc
@@ -36,7 +36,7 @@ local_ring=/data/data/org.linphone/files/oldphone_mono.wav
 dtmf_player_amp=0.1
 
 [video]
-size=vga
+size=qvga
 
 [misc]
 max_calls=10
diff --git a/res/values/non_localizable_defaults.xml b/res/values/non_localizable_defaults.xml
index 8dfbe645a..c74e03e9b 100644
--- a/res/values/non_localizable_defaults.xml
+++ b/res/values/non_localizable_defaults.xml
@@ -52,7 +52,7 @@
     <string name="pref_incoming_call_timeout_default">30</string>
     <string name="pref_image_sharing_server_default">https://www.linphone.org:444/upload.php</string>
     <string name="pref_audio_use_specific_mode_default">0</string>
-    <string name="pref_expire_default">600</string>
+    <string name="pref_expire_default">3600</string>
     <string name="pref_display_name_default">Linphone Android</string>
     <string name="pref_user_name_default">linphone.android</string>
     
diff --git a/src/org/linphone/InCallActivity.java b/src/org/linphone/InCallActivity.java
index 4bad3763b..eea2d6f0b 100644
--- a/src/org/linphone/InCallActivity.java
+++ b/src/org/linphone/InCallActivity.java
@@ -912,16 +912,6 @@ public class InCallActivity extends FragmentActivity implements
 		} catch (LinphoneCoreException e) {
 			e.printStackTrace();
 		}
-		 
-		if (accept) {
-			isSpeakerEnabled = true;
-			LinphoneManager.getInstance().routeAudioToSpeaker();
-			speaker.setBackgroundResource(R.drawable.speaker_on);
-			
-			replaceFragmentAudioByVideo();
-			video.setBackgroundResource(R.drawable.video_off);
-			displayVideoCallControlsIfHidden();
-		}
 	}
 	
 	public void startIncomingCallActivity() {
diff --git a/src/org/linphone/setup/SetupActivity.java b/src/org/linphone/setup/SetupActivity.java
index db59c252d..6ff907493 100644
--- a/src/org/linphone/setup/SetupActivity.java
+++ b/src/org/linphone/setup/SetupActivity.java
@@ -227,19 +227,20 @@ public class SetupActivity extends FragmentActivity implements OnClickListener {
 			
 			boolean isMainAccountLinphoneDotOrg = domain.equals(getString(R.string.default_domain));
 			if (isMainAccountLinphoneDotOrg) {
-				if (getResources().getBoolean(R.bool.disable_all_security_features_for_markets))
+				if (getResources().getBoolean(R.bool.disable_all_security_features_for_markets)) {
 					writePreference(R.string.pref_proxy_key, domain + ":5228");
-				else
+					writePreference(R.string.pref_transport_key, getString(R.string.pref_transport_tcp_key));
+				}
+				else {
 					writePreference(R.string.pref_proxy_key, domain + ":5223");
+					writePreference(R.string.pref_transport_key, getString(R.string.pref_transport_tls_key));
+				}
+				
+				writePreference(R.string.pref_expire_key, "604800"); // 3600*24*7
 				writePreference(R.string.pref_enable_outbound_proxy_key, true);
 				writePreference(R.string.pref_stun_server_key, getString(R.string.default_stun));
-				
 				writePreference(R.string.pref_ice_enable_key, true);
 				writePreference(R.string.pref_push_notification_key, true);
-				if (getResources().getBoolean(R.bool.disable_all_security_features_for_markets))
-					writePreference(R.string.pref_transport_key, getString(R.string.pref_transport_tcp_key));
-				else
-					writePreference(R.string.pref_transport_key, getString(R.string.pref_transport_tls_key));
 			}
 		} else {
 			writePreference(getString(R.string.pref_username_key) + newAccountId, username);