diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b9c0546fc..1cb69dd39 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.linphone"
-      android:versionCode="1320" android:versionName="1.3.2"  android:installLocation="auto"> 
-    <uses-sdk android:minSdkVersion="4"/>
+      android:versionCode="2000" android:versionName="2.0"  android:installLocation="auto"> 
+    <uses-sdk android:minSdkVersion="5" android:targetSdkVersion="15"/>
     
 	<uses-permission android:name="android.permission.INTERNET"/>
 	<uses-permission android:name="android.permission.RECORD_AUDIO"/>
@@ -27,6 +27,7 @@
 
 		<activity android:name="org.linphone.LinphoneLauncherActivity"
 		    android:label="@string/app_name"
+		    android:windowSoftInputMode="adjustPan"
 		    android:theme="@android:style/Theme.NoTitleBar">
 		    <intent-filter>
 		        <action android:name="android.intent.action.MAIN" />
@@ -44,7 +45,7 @@
             <intent-filter>
                 <action android:name="android.intent.action.SENDTO" />
                 <category android:name="android.intent.category.DEFAULT" />
-                <data android:scheme="sip" /><!-- maybe one day -->
+                <data android:scheme="sip" />
                 <data android:scheme="imto" />
 			 </intent-filter>
 		</activity>
@@ -52,11 +53,10 @@
 
 
 		<activity android:name="org.linphone.LinphoneActivity"
-                  android:label="@string/app_name"
-                  android:theme="@android:style/Theme.NoTitleBar"
-                  android:launchMode="singleTask"
-                  > <!-- android:alwaysRetainTaskState="true" clearTaskOnLaunch="false"-->
-                  
+            android:label="@string/app_name"
+            android:theme="@android:style/Theme.NoTitleBar"
+            android:screenOrientation="portrait"
+            android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
@@ -65,162 +65,57 @@
 
         <activity android:name="org.linphone.IncomingCallActivity"
 			android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-			android:launchMode="singleInstance">
+			android:launchMode="singleInstance"
+            android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
          </activity>
 
-        <activity android:name="org.linphone.UriPickerActivity"
-        	android:theme="@android:style/Theme.NoTitleBar"
-        	android:screenOrientation="portrait">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-            </intent-filter>
-         </activity>
-        <activity android:name="org.linphone.UriPickerActivity$DialerActivity" android:theme="@android:style/Theme.NoTitleBar">
+        <activity android:name="org.linphone.FirstLoginActivity" 
+            android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+            android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
          </activity>
 
-        <activity android:name="org.linphone.FirstLoginActivity" android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-            </intent-filter>
-         </activity>
-<!--                    android:launchMode="singleTask"-->
-            <activity android:name="org.linphone.IncallActivity"
-                    android:theme="@android:style/Theme.NoTitleBar"
-                    android:launchMode="singleTask"
-                    android:configChanges="keyboardHidden|orientation">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-            </intent-filter>
-         </activity>
-        <activity android:name="org.linphone.ConferenceDetailsActivity"
-                    android:theme="@android:style/Theme.NoTitleBar"
-                    android:screenOrientation="portrait">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-            </intent-filter>
-         </activity>
-        <activity android:name="org.linphone.LinphonePreferencesSIPAccountActivity"></activity>
-        <activity android:name="org.linphone.LinphonePreferencesActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-            </intent-filter>
-         </activity>
-        <activity android:name="org.linphone.DialerActivity"
-                  android:configChanges="keyboardHidden|orientation">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-            </intent-filter>
-         </activity>
-         <activity android:name="org.linphone.VideoCallActivity"
-          android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-          android:launchMode="singleInstance"
-          android:configChanges="orientation">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-            </intent-filter>
-         </activity>
-        <activity android:name="ContactPickerActivityNew" android:launchMode="singleTop">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-            </intent-filter>
-         </activity>
-         <activity android:name="ContactPickerActivityOld" android:launchMode="singleTop">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-            </intent-filter>
-         </activity>
-		 <activity android:name="org.linphone.HistoryActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-            </intent-filter>
-         </activity>         
-		 <activity android:name="org.linphone.AboutActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-            </intent-filter>
-         </activity>
-
-
-
-    <service android:name="org.linphone.LinphoneService" />
+        <activity android:name="org.linphone.InCallActivity"
+           android:theme="@android:style/Theme.NoTitleBar"
+           android:launchMode="singleTask"
+           android:screenOrientation="portrait">
+           <intent-filter>
+               <action android:name="android.intent.action.MAIN" />
+           </intent-filter>
+        </activity>
         
-	<receiver android:name="org.linphone.NetworkManager">
-		<intent-filter><action android:name="android.net.conn.CONNECTIVITY_CHANGE"></action></intent-filter>
-	</receiver>
+ 
+        <activity android:name=".AccountPreferencesActivity"
+		    android:theme="@android:style/Theme.NoTitleBar"
+            android:screenOrientation="portrait">
+        </activity>
+        <activity android:name=".PreferencesActivity"
+		    android:theme="@android:style/Theme.NoTitleBar"
+            android:screenOrientation="portrait">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
+         </activity>
 
-	<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>
+	    <service android:name="org.linphone.LinphoneService" />
+	        
+		<receiver android:name="org.linphone.NetworkManager">
+			<intent-filter><action android:name="android.net.conn.CONNECTIVITY_CHANGE"></action></intent-filter>
+		</receiver>
 	
+		<receiver android:name="org.linphone.BootReceiver">
+			<intent-filter><action android:name="android.intent.action.BOOT_COMPLETED"></action></intent-filter>
+		</receiver>
 	
-		<activity android:name="org.linphone.TestConferenceActivity"
-                  android:label="Conf test"
-                  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-                  android:enabled="false">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-         </activity>
-        <activity android:name="org.linphone.core.tutorials.TestVideoActivity"
-                  android:label="Video test"
-                  android:theme="@android:style/Theme.NoTitleBar"
-                   android:enabled="false">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-         </activity>
-         <activity android:name="org.linphone.core.tutorials.TutorialHelloWorldActivity"
-                  android:label="Hello World"
-                  android:enabled="false">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-         </activity>
-         <activity android:name="org.linphone.core.tutorials.TutorialRegistrationActivity"
-                  android:label="Registration"
-                  android:enabled="false">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-         </activity>
-         <activity android:name="org.linphone.core.tutorials.TutorialBuddyStatusActivity"
-                  android:label="Buddy status"
-                  android:enabled="false">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-         </activity>
-         <activity android:name="org.linphone.core.tutorials.TutorialChatRoomActivity"
-                  android:label="Chat Room"
-                  android:enabled="false">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-         </activity>
-         <activity android:name="org.mediastreamer2.test.Ring"
-                  android:label="Ring+Echo"
-                  android:enabled="false">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-         </activity>
-</application>
+		<receiver android:name="org.linphone.PhoneStateChangedReceiver">
+			<intent-filter><action android:name="android.intent.action.PHONE_STATE" /></intent-filter>
+		</receiver>
+	
+	</application>
 
 </manifest> 
diff --git a/default.properties b/default.properties
deleted file mode 100644
index ac9e1a0b5..000000000
--- a/default.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system use,
-# "build.properties", and override values to adapt the script to your
-# project structure.
-
-# Project target.
-target=android-13
diff --git a/res/drawable/.DS_Store b/res/drawable/.DS_Store
deleted file mode 100644
index 308abc851..000000000
Binary files a/res/drawable/.DS_Store and /dev/null differ
diff --git a/res/drawable/clavier_bg.xml b/res/drawable/clavier_bg.xml
deleted file mode 100644
index 4b3009000..000000000
--- a/res/drawable/clavier_bg.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_window_focused="false" android:state_enabled="true"
-        android:drawable="@drawable/clavier_bg_grey" />
-    <item android:state_window_focused="false" android:state_enabled="false"
-        android:drawable="@drawable/clavier_bg_darkgrey" />
-    <item android:state_pressed="true" 
-        android:drawable="@drawable/clavier_bg_orange" />
-    <item android:state_focused="true" android:state_enabled="true"
-        android:drawable="@drawable/clavier_bg_orange" />
-    <item android:state_enabled="true"
-        android:drawable="@drawable/clavier_bg_grey" />
-    <item android:state_focused="true"
-        android:drawable="@drawable/clavier_bg_grey" />
-    <item
-         android:drawable="@drawable/clavier_bg_darkgrey" />
-</selector>
diff --git a/res/drawable/clavier_bg_darkgrey.png b/res/drawable/clavier_bg_darkgrey.png
deleted file mode 100644
index e93271086..000000000
Binary files a/res/drawable/clavier_bg_darkgrey.png and /dev/null differ
diff --git a/res/drawable/clavier_bg_grey.png b/res/drawable/clavier_bg_grey.png
deleted file mode 100644
index 151877f97..000000000
Binary files a/res/drawable/clavier_bg_grey.png and /dev/null differ
diff --git a/res/drawable/clavier_bg_orange.png b/res/drawable/clavier_bg_orange.png
deleted file mode 100644
index fe8fef617..000000000
Binary files a/res/drawable/clavier_bg_orange.png and /dev/null differ
diff --git a/res/drawable/conf_callee_active_bg.xml b/res/drawable/conf_callee_active_bg.xml
deleted file mode 100644
index 662710e79..000000000
--- a/res/drawable/conf_callee_active_bg.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?> 
-<shape xmlns:android="http://schemas.android.com/apk/res/android" 
-     android:shape="rectangle"> 
-    <padding android:left="7dp"
-        android:top="7dp"
-        android:right="7dp"
-        android:bottom="7dp" />
-
-    <solid android:color="@color/conf_active_bg_color"/> 
-    <corners android:radius="15dp" /> 
-</shape> 
-
diff --git a/res/drawable/conf_callee_bg.xml b/res/drawable/conf_callee_bg.xml
deleted file mode 100644
index 34c4f8687..000000000
--- a/res/drawable/conf_callee_bg.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?> 
-<shape xmlns:android="http://schemas.android.com/apk/res/android" 
-     android:shape="rectangle"> 
-    <solid android:color="#777777"/> 
-    <corners android:radius="15dp"/> 
-</shape> 
-
diff --git a/res/drawable/conf_callee_incoming_bg.xml b/res/drawable/conf_callee_incoming_bg.xml
deleted file mode 100644
index 65ed06b42..000000000
--- a/res/drawable/conf_callee_incoming_bg.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?> 
-<shape xmlns:android="http://schemas.android.com/apk/res/android" 
-     android:shape="rectangle"> 
-    <padding android:left="7dp"
-        android:top="7dp"
-        android:right="7dp"
-        android:bottom="7dp" />
-
-    <solid android:color="#336600"/> 
-    <corners android:radius="15dp" /> 
-</shape> 
-
diff --git a/res/drawable/conf_callee_inconf_bg.xml b/res/drawable/conf_callee_inconf_bg.xml
deleted file mode 100644
index ada123c15..000000000
--- a/res/drawable/conf_callee_inconf_bg.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?> 
-<shape xmlns:android="http://schemas.android.com/apk/res/android" 
-     android:shape="rectangle"> 
-    <padding android:left="7dp"
-        android:top="7dp"
-        android:right="7dp"
-        android:bottom="7dp" />
-
-    <solid android:color="#444444"/> 
-    <corners android:radius="15dp" /> 
-</shape> 
-
diff --git a/res/drawable/conf_callee_pressed_bg.xml b/res/drawable/conf_callee_pressed_bg.xml
deleted file mode 100644
index 31cfd4a6f..000000000
--- a/res/drawable/conf_callee_pressed_bg.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?> 
-<shape xmlns:android="http://schemas.android.com/apk/res/android" 
-     android:shape="rectangle"> 
-    <solid android:color="#2E64FE"/> 
-    <corners android:radius="15dp"/>
-    <padding android:left="7dp"
-        android:top="7dp"
-        android:right="7dp"
-        android:bottom="7dp" />
-
-</shape> 
-
diff --git a/res/drawable/conf_callee_selected_bg.xml b/res/drawable/conf_callee_selected_bg.xml
deleted file mode 100644
index d98b22f5a..000000000
--- a/res/drawable/conf_callee_selected_bg.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?> 
-<shape xmlns:android="http://schemas.android.com/apk/res/android" 
-     android:shape="rectangle"> 
-    <solid android:color="#ff9200"/> 
-    <corners android:radius="15dp"/> 
-</shape> 
-
diff --git a/res/drawable/conf_callee_selector_active.xml b/res/drawable/conf_callee_selector_active.xml
deleted file mode 100644
index cb64a4a1e..000000000
--- a/res/drawable/conf_callee_selector_active.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_pressed="true" android:drawable="@drawable/conf_callee_pressed_bg" />
-	<item android:drawable="@drawable/conf_callee_active_bg" />
-</selector>
-
diff --git a/res/drawable/conf_callee_selector_incoming.xml b/res/drawable/conf_callee_selector_incoming.xml
deleted file mode 100644
index b7e045d00..000000000
--- a/res/drawable/conf_callee_selector_incoming.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_pressed="true" android:drawable="@drawable/conf_callee_pressed_bg" />
-	<item android:drawable="@drawable/conf_callee_incoming_bg" />
-</selector>
-
diff --git a/res/drawable/conf_callee_selector_inconf.xml b/res/drawable/conf_callee_selector_inconf.xml
deleted file mode 100644
index 85e3ea5ff..000000000
--- a/res/drawable/conf_callee_selector_inconf.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_pressed="true" android:drawable="@drawable/conf_callee_pressed_bg" />
-	<item android:drawable="@drawable/conf_callee_inconf_bg" />
-</selector>
-
diff --git a/res/drawable/conf_callee_selector_normal.xml b/res/drawable/conf_callee_selector_normal.xml
deleted file mode 100644
index 2da1f36ac..000000000
--- a/res/drawable/conf_callee_selector_normal.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_pressed="true" android:drawable="@drawable/conf_callee_pressed_bg" />
-	<item android:drawable="@drawable/conf_callee_bg" />
-</selector>
-
diff --git a/res/drawable/conf_details.png b/res/drawable/conf_details.png
deleted file mode 100644
index 7168af580..000000000
Binary files a/res/drawable/conf_details.png and /dev/null differ
diff --git a/res/drawable/conf_maybe_secured.png b/res/drawable/conf_maybe_secured.png
deleted file mode 100644
index 106cf427d..000000000
Binary files a/res/drawable/conf_maybe_secured.png and /dev/null differ
diff --git a/res/drawable/conf_merge.png b/res/drawable/conf_merge.png
deleted file mode 100644
index 2f76509b5..000000000
Binary files a/res/drawable/conf_merge.png and /dev/null differ
diff --git a/res/drawable/conf_merge_all.png b/res/drawable/conf_merge_all.png
deleted file mode 100644
index 66626fe71..000000000
Binary files a/res/drawable/conf_merge_all.png and /dev/null differ
diff --git a/res/drawable/conf_not_secured.png b/res/drawable/conf_not_secured.png
deleted file mode 100644
index 1381f4d17..000000000
Binary files a/res/drawable/conf_not_secured.png and /dev/null differ
diff --git a/res/drawable/conf_pause.png b/res/drawable/conf_pause.png
deleted file mode 100644
index 9ab5bae92..000000000
Binary files a/res/drawable/conf_pause.png and /dev/null differ
diff --git a/res/drawable/conf_permute.png b/res/drawable/conf_permute.png
deleted file mode 100644
index 225b8bf7d..000000000
Binary files a/res/drawable/conf_permute.png and /dev/null differ
diff --git a/res/drawable/conf_remove.png b/res/drawable/conf_remove.png
deleted file mode 100644
index 7570cc599..000000000
Binary files a/res/drawable/conf_remove.png and /dev/null differ
diff --git a/res/drawable/conf_resume.png b/res/drawable/conf_resume.png
deleted file mode 100644
index b8a2d50cd..000000000
Binary files a/res/drawable/conf_resume.png and /dev/null differ
diff --git a/res/drawable/conf_secured.png b/res/drawable/conf_secured.png
deleted file mode 100644
index 61042339f..000000000
Binary files a/res/drawable/conf_secured.png and /dev/null differ
diff --git a/res/drawable/conf_speaking.png b/res/drawable/conf_speaking.png
deleted file mode 100644
index 2324d81c3..000000000
Binary files a/res/drawable/conf_speaking.png and /dev/null differ
diff --git a/res/drawable/conf_status_inconf.png b/res/drawable/conf_status_inconf.png
deleted file mode 100644
index 3f89fb3fb..000000000
Binary files a/res/drawable/conf_status_inconf.png and /dev/null differ
diff --git a/res/drawable/conf_terminate.png b/res/drawable/conf_terminate.png
deleted file mode 100644
index 0a11c639e..000000000
Binary files a/res/drawable/conf_terminate.png and /dev/null differ
diff --git a/res/drawable/conf_transfer.png b/res/drawable/conf_transfer.png
deleted file mode 100644
index d539cd241..000000000
Binary files a/res/drawable/conf_transfer.png and /dev/null differ
diff --git a/res/drawable/contact_orange.png b/res/drawable/contact_orange.png
deleted file mode 100644
index 53ba07ed8..000000000
Binary files a/res/drawable/contact_orange.png and /dev/null differ
diff --git a/res/drawable/dialer_orange.png b/res/drawable/dialer_orange.png
deleted file mode 100644
index 2d715eac0..000000000
Binary files a/res/drawable/dialer_orange.png and /dev/null differ
diff --git a/res/drawable/history_orange.png b/res/drawable/history_orange.png
deleted file mode 100644
index dc9bbf60a..000000000
Binary files a/res/drawable/history_orange.png and /dev/null differ
diff --git a/res/drawable/in_call.png b/res/drawable/in_call.png
deleted file mode 100644
index d48369e6a..000000000
Binary files a/res/drawable/in_call.png and /dev/null differ
diff --git a/res/drawable/in_call_mini.png b/res/drawable/in_call_mini.png
deleted file mode 100644
index e307d23e3..000000000
Binary files a/res/drawable/in_call_mini.png and /dev/null differ
diff --git a/res/drawable/incall_add.png b/res/drawable/incall_add.png
deleted file mode 100755
index c1526d8ba..000000000
Binary files a/res/drawable/incall_add.png and /dev/null differ
diff --git a/res/drawable/incall_add_small.png b/res/drawable/incall_add_small.png
deleted file mode 100755
index 9913cc582..000000000
Binary files a/res/drawable/incall_add_small.png and /dev/null differ
diff --git a/res/drawable/incall_back.png b/res/drawable/incall_back.png
deleted file mode 100755
index 685c72cbb..000000000
Binary files a/res/drawable/incall_back.png and /dev/null differ
diff --git a/res/drawable/incall_dialpad.png b/res/drawable/incall_dialpad.png
deleted file mode 100755
index 3d2d9495b..000000000
Binary files a/res/drawable/incall_dialpad.png and /dev/null differ
diff --git a/res/drawable/incall_merge.png b/res/drawable/incall_merge.png
deleted file mode 100755
index 70ed3cbc7..000000000
Binary files a/res/drawable/incall_merge.png and /dev/null differ
diff --git a/res/drawable/incall_micro.png b/res/drawable/incall_micro.png
deleted file mode 100755
index 7c694fbff..000000000
Binary files a/res/drawable/incall_micro.png and /dev/null differ
diff --git a/res/drawable/incall_micro_inverse.png b/res/drawable/incall_micro_inverse.png
deleted file mode 100755
index dc38d85a6..000000000
Binary files a/res/drawable/incall_micro_inverse.png and /dev/null differ
diff --git a/res/drawable/incall_pause.png b/res/drawable/incall_pause.png
deleted file mode 100755
index 37d96580b..000000000
Binary files a/res/drawable/incall_pause.png and /dev/null differ
diff --git a/res/drawable/incall_pause_inverse.png b/res/drawable/incall_pause_inverse.png
deleted file mode 100755
index 0b46f283c..000000000
Binary files a/res/drawable/incall_pause_inverse.png and /dev/null differ
diff --git a/res/drawable/incall_speaker.png b/res/drawable/incall_speaker.png
deleted file mode 100755
index 95d132189..000000000
Binary files a/res/drawable/incall_speaker.png and /dev/null differ
diff --git a/res/drawable/incall_speaker_inverse.png b/res/drawable/incall_speaker_inverse.png
deleted file mode 100755
index e343dba73..000000000
Binary files a/res/drawable/incall_speaker_inverse.png and /dev/null differ
diff --git a/res/drawable/mic_active.png b/res/drawable/mic_active.png
deleted file mode 100644
index 662526993..000000000
Binary files a/res/drawable/mic_active.png and /dev/null differ
diff --git a/res/drawable/mic_muted.png b/res/drawable/mic_muted.png
deleted file mode 100644
index f813691fc..000000000
Binary files a/res/drawable/mic_muted.png and /dev/null differ
diff --git a/res/drawable/mini_stopcall_red.png b/res/drawable/mini_stopcall_red.png
deleted file mode 100644
index fcf26c8bd..000000000
Binary files a/res/drawable/mini_stopcall_red.png and /dev/null differ
diff --git a/res/drawable/notok.png b/res/drawable/notok.png
deleted file mode 100644
index 84813bc2d..000000000
Binary files a/res/drawable/notok.png and /dev/null differ
diff --git a/res/drawable/numpad.png b/res/drawable/numpad.png
deleted file mode 100644
index f3965ef43..000000000
Binary files a/res/drawable/numpad.png and /dev/null differ
diff --git a/res/drawable/numpad_big.png b/res/drawable/numpad_big.png
deleted file mode 100644
index 2f1706869..000000000
Binary files a/res/drawable/numpad_big.png and /dev/null differ
diff --git a/res/drawable/ok.png b/res/drawable/ok.png
deleted file mode 100644
index 769986fb7..000000000
Binary files a/res/drawable/ok.png and /dev/null differ
diff --git a/res/drawable/out_call.png b/res/drawable/out_call.png
deleted file mode 100644
index 80640c31a..000000000
Binary files a/res/drawable/out_call.png and /dev/null differ
diff --git a/res/drawable/out_call_mini.png b/res/drawable/out_call_mini.png
deleted file mode 100644
index a3abd2de9..000000000
Binary files a/res/drawable/out_call_mini.png and /dev/null differ
diff --git a/res/drawable/picker_transfer.png b/res/drawable/picker_transfer.png
deleted file mode 100644
index 0251581f3..000000000
Binary files a/res/drawable/picker_transfer.png and /dev/null differ
diff --git a/res/drawable/resume_blue.png b/res/drawable/resume_blue.png
deleted file mode 100644
index 8274e4a8d..000000000
Binary files a/res/drawable/resume_blue.png and /dev/null differ
diff --git a/res/drawable/speaker_32_off.png b/res/drawable/speaker_32_off.png
deleted file mode 100644
index e93ae232f..000000000
Binary files a/res/drawable/speaker_32_off.png and /dev/null differ
diff --git a/res/drawable/speaker_32_on.png b/res/drawable/speaker_32_on.png
deleted file mode 100644
index de8d4460e..000000000
Binary files a/res/drawable/speaker_32_on.png and /dev/null differ
diff --git a/res/drawable/startcall_green.png b/res/drawable/startcall_green.png
deleted file mode 100644
index 940802a0c..000000000
Binary files a/res/drawable/startcall_green.png and /dev/null differ
diff --git a/res/drawable/startvideo_green.png b/res/drawable/startvideo_green.png
deleted file mode 100644
index 1cc2e3e4b..000000000
Binary files a/res/drawable/startvideo_green.png and /dev/null differ
diff --git a/res/drawable/stat_sys_signal_0.png b/res/drawable/stat_sys_signal_0.png
deleted file mode 100644
index 0b7a04f44..000000000
Binary files a/res/drawable/stat_sys_signal_0.png and /dev/null differ
diff --git a/res/drawable/stat_sys_signal_1.png b/res/drawable/stat_sys_signal_1.png
deleted file mode 100644
index 5376e9258..000000000
Binary files a/res/drawable/stat_sys_signal_1.png and /dev/null differ
diff --git a/res/drawable/stat_sys_signal_2.png b/res/drawable/stat_sys_signal_2.png
deleted file mode 100644
index fd543636c..000000000
Binary files a/res/drawable/stat_sys_signal_2.png and /dev/null differ
diff --git a/res/drawable/stat_sys_signal_3.png b/res/drawable/stat_sys_signal_3.png
deleted file mode 100644
index 6c4873af3..000000000
Binary files a/res/drawable/stat_sys_signal_3.png and /dev/null differ
diff --git a/res/drawable/stat_sys_signal_4.png b/res/drawable/stat_sys_signal_4.png
deleted file mode 100644
index a3320cbb4..000000000
Binary files a/res/drawable/stat_sys_signal_4.png and /dev/null differ
diff --git a/res/drawable/stopcall_red.png b/res/drawable/stopcall_red.png
deleted file mode 100644
index 1004b8a01..000000000
Binary files a/res/drawable/stopcall_red.png and /dev/null differ
diff --git a/res/drawable/unknown_person.png b/res/drawable/unknown_person.png
deleted file mode 100755
index 297b14b14..000000000
Binary files a/res/drawable/unknown_person.png and /dev/null differ
diff --git a/res/drawable/video_active.png b/res/drawable/video_active.png
deleted file mode 100644
index c6bb5ddce..000000000
Binary files a/res/drawable/video_active.png and /dev/null differ
diff --git a/res/drawable/video_muted.png b/res/drawable/video_muted.png
deleted file mode 100644
index c9f83aee1..000000000
Binary files a/res/drawable/video_muted.png and /dev/null differ
diff --git a/res/layout-land/dialer.xml b/res/layout-land/dialer.xml
deleted file mode 100644
index 3a1326c69..000000000
--- a/res/layout-land/dialer.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical" android:layout_width="fill_parent"
-	android:layout_height="fill_parent">
- 
-
-	<LinearLayout android:layout_height="wrap_content"
-		android:layout_width="fill_parent" android:id="@+id/Addresslayout">
-		<org.linphone.ui.AddressText android:id="@+id/SipUri" android:layout_height="wrap_content"
-			android:hint="sip:" android:layout_width="fill_parent" android:lines="1"
-			android:singleLine="true" android:layout_weight="0.2" android:editable="@bool/allow_edit_in_dialer"/>
-		<org.linphone.ui.EraseButton android:layout_height="wrap_content" android:id="@+id/Erase"
-			android:layout_width="fill_parent" android:layout_weight="0.8"
-			android:text="&lt;"/>
-	</LinearLayout>
-
-	
-	<FrameLayout
-		android:layout_height="fill_parent" 
-		android:layout_width="fill_parent">
-		
-		<LinearLayout
-			android:orientation="vertical" 
-			android:layout_width="fill_parent"
-			android:layout_height="fill_parent"
-			android:layout_marginBottom="23sp">
-	
-			<View android:layout_width="0px" android:visibility="invisible" android:layout_weight="1" android:layout_height="fill_parent" />
-			
-			<LinearLayout android:id="@+id/CallControlRow" android:layout_height="wrap_content" android:layout_width="fill_parent" android:gravity="bottom">
-				<org.linphone.ui.CallButton 
-				    android:id="@+id/Call"
-					android:layout_height="fill_parent" 
-					android:layout_width="fill_parent" 
-					android:layout_weight="1" 
-					android:background="@drawable/clavier_bg" 
-					android:src="@drawable/startcall_green"/>
-				
-				<LinearLayout
-				    android:id="@+id/InCallControls"
-					android:layout_height="fill_parent" 
-					android:layout_width="fill_parent"
-					android:orientation="horizontal" 
-					android:visibility="gone"
-					android:layout_weight="3" >
-					
-	                <Button 
-					    android:id="@+id/AddCall"
-					    style="@style/DialerDigit"
-						android:layout_height="fill_parent" 
-						android:layout_width="fill_parent" 
-						android:layout_weight="1" 
-						android:text="@string/AddCallButtonText" />
-	                
-					<Button 
-					    android:id="@+id/Back"
-					    style="@style/DialerDigit"
-						android:layout_height="fill_parent" 
-						android:layout_width="fill_parent" 
-						android:layout_weight="1" 
-						android:text="@string/CancelButtonText" />
-					
-				</LinearLayout>
-			</LinearLayout>
-			
-		</LinearLayout>
-		
-		<SlidingDrawer
-			android:id="@+id/drawer"
-			android:layout_width="fill_parent"
-			android:layout_height="fill_parent"
-			android:handle="@+id/handle"
-			android:layout_weight="1"
-			android:content="@+id/accounts">
-			
-		    <LinearLayout
-		        android:id="@id/handle"
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:orientation="horizontal"
-				android:background="#000000"
-				android:gravity="center_vertical">
-		        
-		        <EditText 
-				    android:id="@+id/status_label" 
-				    android:clickable="false" 
-				    android:focusable="false" 
-				    android:cursorVisible="false" 
-				    android:textSize="12sp" 
-					android:background="#000000"
-				    android:layout_height="wrap_content" 
-				    android:layout_width="fill_parent" 
-				    android:layout_weight="4"
-				    android:textColor="@android:color/white" />
-		        
-		        <ImageView
-				    android:layout_height="wrap_content" 
-				    android:layout_width="fill_parent"
-				    android:layout_weight="100"
-				    android:src="@drawable/conf_details"/>
-		        
-		    </LinearLayout>
-			
-			<ListView
-				android:id="@id/accounts"
-				android:background="#CC000000"
-				android:layout_width="fill_parent"
-				android:layout_height="fill_parent" />
-			
-		</SlidingDrawer>
-		
-	</FrameLayout>
-</LinearLayout>
diff --git a/res/layout-land/videocall.xml b/res/layout-land/videocall.xml
deleted file mode 100755
index 2d39b8f84..000000000
--- a/res/layout-land/videocall.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:id="@+id/video_frame" android:orientation="vertical"
-  android:layout_height="fill_parent" android:layout_width="fill_parent">
-  
-<org.linphone.mediastream.video.display.GL2JNIView android:layout_height="fill_parent" android:layout_width="fill_parent" android:id="@+id/video_surface"></org.linphone.mediastream.video.display.GL2JNIView>
-<SurfaceView 
-android:layout_height="72dip" 
-android:layout_width="88dip" 
-android:id="@+id/video_capture_surface" 
-android:layout_alignParentTop="true"
-android:layout_alignParentRight="true"
-android:layout_marginTop="15dip"
-android:layout_marginRight="15dip" >
-</SurfaceView>
-
-<ImageView 
-android:layout_width="88dip"
-android:layout_height="72dip" 
-android:id="@+id/imageView1" 
-android:src="@drawable/video_muted" 
-android:layout_alignParentTop="true"
-android:layout_alignParentRight="true"
-android:layout_marginTop="15dip"
-android:layout_marginRight="15dip" >
-</ImageView>
-
-<ImageView 
-android:layout_width="wrap_content"
-android:layout_height="wrap_content" 
-android:id="@+id/QoS" 
-android:src="@drawable/stat_sys_signal_0" 
-android:layout_alignParentBottom="true"
-android:layout_alignParentRight="true">
-</ImageView> 
-</RelativeLayout>
-
diff --git a/res/layout-xlarge/dialer.xml b/res/layout-xlarge/dialer.xml
deleted file mode 100644
index 9d0dbba6a..000000000
--- a/res/layout-xlarge/dialer.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent" 
-	android:layout_height="fill_parent"
-    android:gravity="bottom|center_horizontal">
- 
-    <org.linphone.ui.CameraView
-	    android:id="@+id/video_background"
-	    android:layout_width="fill_parent"
-	    android:layout_height="fill_parent"
-	    android:layout_weight="1" />
-   
-	<LinearLayout
-	    android:layout_width="wrap_content"
-	    android:layout_height="wrap_content"
-	    android:layout_gravity="center_horizontal|bottom"
-	    android:orientation="vertical" >
-		
-		<LinearLayout 
-		    android:layout_height="wrap_content"
-			android:layout_width="fill_parent" 
-			android:id="@+id/Addresslayout">
-			
-			<org.linphone.ui.AddressText 
-			    android:id="@+id/SipUri" 
-			    android:layout_height="wrap_content"
-				android:hint="sip:" 
-				android:layout_width="fill_parent" 
-				android:lines="1"
-				android:singleLine="true" 
-				android:layout_weight="0.2" 
-				android:editable="@bool/allow_edit_in_dialer"/>
-			
-			<org.linphone.ui.EraseButton 
-			    android:layout_height="wrap_content" 
-			    android:id="@+id/Erase"
-			    style="@style/DialerDigit"
-				android:layout_width="fill_parent" 
-				android:layout_weight="0.8"
-				android:text="&lt;"/>
-			
-		</LinearLayout>
-					
-	    <LinearLayout
-		    android:layout_height="wrap_content" 
-		    android:layout_width="fill_parent" 
-		    android:orientation="horizontal">
-		
-	        <org.linphone.ui.Numpad 
-			    android:id="@+id/Dialer" 
-			    android:layout_width="fill_parent" 
-			    android:layout_height="fill_parent" 
-			    android:layout_weight="0.5" />
-	        
-	        <LinearLayout
-			    android:layout_height="fill_parent" 
-			    android:layout_width="fill_parent"
-				android:layout_weight="0.5" 
-			    android:layout_marginLeft="40dp"
-		    	android:orientation="vertical">
-					
-				<org.linphone.ui.CallButton 
-				    android:id="@+id/Call"
-					android:layout_height="fill_parent" 
-					android:layout_width="fill_parent" 
-					android:layout_weight="3" 
-					android:background="@drawable/clavier_bg" 
-					android:src="@drawable/startcall_green" />
-				
-	            <LinearLayout
-				    android:id="@+id/InCallControls"
-					android:layout_height="fill_parent" 
-					android:layout_width="fill_parent" 
-					android:visibility="gone"
-					android:layout_weight="3" >
-					
-	                <Button 
-					    android:id="@+id/AddCall"
-					    style="@style/DialerDigit"
-						android:layout_height="fill_parent" 
-						android:layout_width="fill_parent" 
-						android:layout_weight="1" 
-						android:text="@string/AddCallButtonText" />
-	                
-					<Button 
-					    android:id="@+id/Back"
-					    style="@style/DialerDigit"
-						android:layout_height="fill_parent" 
-						android:layout_width="fill_parent" 
-						android:layout_weight="1" 
-						android:text="@string/CancelButtonText" />
-					
-				</LinearLayout>
-				
-				<Button 
-				    android:id="@+id/switch_camera"
-				    style="@style/DialerDigit"
-					android:layout_height="fill_parent" 
-					android:layout_width="fill_parent" 
-					android:layout_weight="5" 
-					android:visibility="invisible"
-					android:text="@string/menu_videocall_switch_camera_title" />
-				
-			    <EditText 
-				    android:id="@+id/status_label" 
-				    android:clickable="false" 
-				    android:focusable="false" 
-				    android:cursorVisible="false" 
-				    android:textSize="12sp" 
-					android:background="#00000000"
-				    android:layout_height="fill_parent" 
-				    android:layout_width="fill_parent" 
-				    android:layout_weight="7"
-				    android:textColor="@android:color/white" />
-				
-			</LinearLayout>
-	        
-	    </LinearLayout>
-	    
-	</LinearLayout>
-		
-</FrameLayout>
\ No newline at end of file
diff --git a/res/layout-xlarge/incall_layout.xml b/res/layout-xlarge/incall_layout.xml
deleted file mode 100644
index c5f84add3..000000000
--- a/res/layout-xlarge/incall_layout.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
- <RelativeLayout
-     xmlns:android="http://schemas.android.com/apk/res/android"
-     xmlns:ui="http://schemas.android.com/apk/res-auto"
-     android:layout_width="match_parent"
-     android:layout_height="match_parent"
-     android:orientation="vertical">
-
-	<LinearLayout 
-	    android:id="@+id/conf_header" 
-	    android:layout_alignParentTop="true"
-		android:layout_marginBottom="10dip"
-		android:layout_width="fill_parent" 
-		android:layout_height="wrap_content" 
-		android:layout_alignWithParentIfMissing="true"
-		android:minHeight="60sp"
-		android:background="@drawable/conf_callee_selector_normal" >
-      	
-      	<TextView 
-      	    android:text="@string/conf_conference" 
-      	    style="@style/callee_address"
-        	android:layout_width="fill_parent" 
-        	android:layout_height="wrap_content" 
-        	android:gravity="center" 
-        	android:layout_gravity="center_vertical" />
-      	
-      	<ImageButton 
-      	    android:id="@+id/conf_header_details"
-      	    android:layout_width="wrap_content" 
-      	    android:layout_height="fill_parent"
-      	    android:scaleType="center" 
-      	    android:src="@drawable/conf_details"/>
-      	
-	</LinearLayout>
-
-	<LinearLayout 
-	    android:id="@+id/incall_controls_layout"
-		android:layout_alignParentBottom="true" 
-		android:orientation="vertical"
-		android:layout_width="fill_parent" 
-		android:layout_height="wrap_content"
-    	android:gravity="bottom|center_horizontal">
-
-	    <LinearLayout
-		    android:layout_width="wrap_content" 
-		    android:layout_height="wrap_content"
-			android:orientation="vertical">
-	        
-			<LinearLayout 
-			    android:layout_width="fill_parent" 
-			    android:layout_height="wrap_content">
-		    
-				<org.linphone.ui.ToggleImageButton 
-				    android:id="@+id/toggleMuteMic"
-		            style="@style/incall_control"
-					ui:checked="@drawable/incall_micro_inverse"
-					ui:unchecked="@drawable/incall_micro"
-					ui:bgdrawables="true" />
-	
-		        <ImageButton 
-		            android:id="@+id/incallNumpadShow"
-		            style="@style/incall_control"
-					android:background="@drawable/incall_dialpad" />
-	
-		        <org.linphone.ui.ToggleImageButton
-		            android:id="@+id/toggleSpeaker"
-		            style="@style/incall_control"
-					ui:checked="@drawable/incall_speaker_inverse"
-					ui:unchecked="@drawable/incall_speaker"
-					ui:bgdrawables="true" />
-		        
-			</LinearLayout>
-		
-			<LinearLayout 
-			    android:layout_width="fill_parent" 
-			    android:layout_height="wrap_content">
-			        
-				<ImageButton 
-				    android:id="@+id/addCall"
-				    style="@style/incall_control"
-				    android:background="@drawable/incall_add" />
-		
-		        <ImageButton 
-		            android:id="@+id/conf_simple_merge"
-		            style="@style/incall_control"
-		            android:visibility="gone"
-		            android:background="@drawable/incall_merge" />
-		
-		        <org.linphone.ui.ToggleImageButton 
-		            android:id="@+id/conf_simple_pause"
-		            style="@style/incall_control"
-		            ui:checked="@drawable/incall_pause_inverse"
-					ui:unchecked="@drawable/incall_pause"
-					ui:bgdrawables="true" />
-		
-		        <Button 
-		            android:id="@+id/conf_simple_video"
-		            style="@style/incall_control"
-		            android:text="@string/conf_simple_video_bt_txt"
-		            android:background="@drawable/clavier_bg" />
-			        
-			</LinearLayout>
-	
-			<ImageButton
-			    android:id="@+id/incallHang"
-			    android:layout_width="fill_parent"
-			    android:layout_height="wrap_content"
-			    android:background="@drawable/clavier_bg"
-			    android:minHeight="60dip"
-			    android:src="@drawable/stopcall_red" />
-			
-		</LinearLayout>
-		
-	</LinearLayout>
-
-
-	<RelativeLayout 
-	    android:id="@+id/picture_wrapper"
-	    android:layout_height="wrap_content" 
-	    android:layout_width="fill_parent" 
-		android:layout_above="@id/incall_controls_layout">
-	
-		<ImageView 
-		    android:id="@+id/incall_picture" 
-		    android:visibility="gone"
-		    android:layout_centerInParent="true" 
-		    android:paddingBottom="8dip"
-			android:layout_height="wrap_content" 
-			android:layout_width="wrap_content" 
-			android:layout_gravity="center" 
-			android:scaleType="fitCenter"
-			android:minWidth="120dip" 
-			android:minHeight="120dip" />
-		
-	</RelativeLayout>
-
-     <ListView 
-         android:id="@android:id/list"
-         android:layout_width="fill_parent"
-         android:layout_height="wrap_content"
-         android:drawSelectorOnTop="true"
-         android:dividerHeight="10dip"
-         android:divider="@android:color/transparent"
-         android:layout_below="@id/conf_header"
-         android:layout_above="@id/picture_wrapper"
-         android:layout_alignWithParentIfMissing="true"
-         android:fadeScrollbars="false" />
-     
- </RelativeLayout>
diff --git a/res/layout-xlarge/videocall.xml b/res/layout-xlarge/videocall.xml
deleted file mode 100755
index 310aa47e8..000000000
--- a/res/layout-xlarge/videocall.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:ui="http://schemas.android.com/apk/res-auto"
-  android:id="@+id/video_frame"
-  android:layout_height="fill_parent" android:layout_width="fill_parent">
-  
-	<org.linphone.mediastream.video.display.GL2JNIView 
-	    android:visibility="visible" 
-	    android:layout_height="fill_parent" 
-	    android:layout_width="fill_parent" 
-	    android:id="@+id/video_surface">
-	</org.linphone.mediastream.video.display.GL2JNIView>
-	
-	<SurfaceView 
-		android:layout_height="148dip" 
-		android:layout_width="176dip" 
-		android:id="@+id/video_capture_surface" 
-		android:layout_alignParentBottom="true"
-		android:layout_alignParentRight="true"
-		android:layout_marginBottom="15dip"
-		android:layout_marginRight="15dip" >
-	</SurfaceView>
-	
-	<ImageView 
-		android:layout_width="88dip"
-		android:layout_height="72dip" 
-		android:id="@+id/imageView1" 
-		android:src="@drawable/video_muted" 
-		android:layout_alignParentBottom="true"
-		android:layout_alignParentRight="true"
-		android:layout_marginBottom="15dip"
-		android:layout_marginRight="15dip" >
-	</ImageView>
-	 
-	<ImageView 
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content" 
-		android:id="@+id/QoS" 
-		android:src="@drawable/stat_sys_signal_0" 
-		android:layout_alignParentBottom="true"
-		android:layout_alignParentLeft="true" >
-	</ImageView> 
-
-	<LinearLayout 
-	    android:id="@+id/incall_controls_layout"
-	    android:visibility="gone"
-		android:layout_alignParentBottom="true" 
-		android:orientation="vertical"
-		android:layout_width="fill_parent" 
-		android:layout_height="wrap_content"
-    	android:gravity="bottom|center_horizontal">
-
-	    <LinearLayout
-		    android:layout_width="wrap_content" 
-		    android:layout_height="wrap_content"
-			android:orientation="vertical">
-	        
-	        <Button 
-	            style="@style/incall_control"
-	            android:background="@drawable/clavier_bg"
-			    android:id="@+id/switch_camera"
-				android:layout_height="wrap_content" 
-				android:layout_width="fill_parent" 
-				android:text="@string/menu_videocall_switch_camera_title" />
-	        
-	        <LinearLayout 
-			    android:layout_width="fill_parent" 
-			    android:layout_height="wrap_content">
-		    
-				<org.linphone.ui.ToggleImageButton 
-				    android:id="@+id/toggleMuteMic"
-		            style="@style/incall_control"
-					ui:checked="@drawable/incall_micro_inverse"
-					ui:unchecked="@drawable/incall_micro"
-					ui:bgdrawables="true" />
-	
-		        <ImageButton 
-		            android:id="@+id/incallNumpadShow"
-		            style="@style/incall_control"
-					android:background="@drawable/incall_dialpad" />
-	
-		        <org.linphone.ui.ToggleImageButton
-		            android:id="@+id/toggleSpeaker"
-		            style="@style/incall_control"
-					ui:checked="@drawable/incall_speaker_inverse"
-					ui:unchecked="@drawable/incall_speaker"
-					ui:bgdrawables="true" />
-		        
-			</LinearLayout>
-		
-			<LinearLayout 
-			    android:layout_width="fill_parent" 
-			    android:layout_height="wrap_content">
-			        
-				<ImageButton 
-				    android:id="@+id/back"
-				    style="@style/incall_control"
-				    android:background="@drawable/incall_back" />
-		
-		        <org.linphone.ui.ToggleImageButton 
-		            android:id="@+id/conf_simple_pause"
-		            style="@style/incall_control"
-		            ui:checked="@drawable/incall_pause_inverse"
-					ui:unchecked="@drawable/incall_pause"
-					ui:bgdrawables="true" />
-		
-		        <Button 
-		            android:id="@+id/conf_simple_video"
-		            style="@style/incall_control"
-		            android:text="-Video"
-		            android:background="@drawable/clavier_bg" />
-			        
-			</LinearLayout>
-	
-			<ImageButton
-			    android:id="@+id/incallHang"
-			    android:layout_width="fill_parent"
-			    android:layout_height="wrap_content"
-			    android:background="@drawable/clavier_bg"
-			    android:minHeight="60dip"
-			    android:src="@drawable/stopcall_red" />
-			
-		</LinearLayout>
-		
-	</LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/about.xml b/res/layout/about.xml
deleted file mode 100644
index ab2a6883f..000000000
--- a/res/layout/about.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent" android:orientation="vertical"
-	android:gravity="center" android:layout_height="fill_parent">
-	<ImageView android:id="@+id/ImageView01"
-		android:layout_height="wrap_content" android:layout_width="wrap_content"
-		android:src="@drawable/linphone_banner"></ImageView>
-	<TextView android:layout_width="wrap_content"
-		android:layout_height="wrap_content" android:text="@string/about_text"
-		android:autoLink="web" android:gravity="center" android:paddingTop="50sp"
-		android:textStyle="bold" android:id="@+id/AboutText"></TextView>
-	<Button android:id="@+id/about_report_issue"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:text="@string/about_report_issue"
-		android:visibility="gone"
-		android:layout_marginTop="30sp"/>
-</LinearLayout>
diff --git a/res/layout/accounts.xml b/res/layout/accounts.xml
deleted file mode 100644
index c0065ef70..000000000
--- a/res/layout/accounts.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent" android:orientation="horizontal"
-	android:gravity="center" android:layout_height="fill_parent">
-	
-    <ImageView
-        android:id="@+id/State"
-		android:layout_width="wrap_content" 
-		android:layout_height="wrap_content"
-		android:layout_weight="1"/>
-    
-    <TextView 
-        android:id="@+id/Identity"
-		android:layout_width="fill_parent" 
-		android:layout_height="wrap_content"
-		android:gravity="center"
-		android:layout_weight="4"/>
-    
-</LinearLayout>
diff --git a/res/layout/conf_callee.xml b/res/layout/conf_callee.xml
deleted file mode 100644
index e3792b58d..000000000
--- a/res/layout/conf_callee.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:minHeight="60sp" android:background="@drawable/conf_callee_bg"
-  android:layout_width="fill_parent" android:layout_height="fill_parent" >
-  
-    <ImageView android:id="@+id/picture" android:layout_width="wrap_content"
-     android:src="@drawable/unknown_person" android:layout_height="wrap_content"
-     android:layout_alignParentLeft="true" android:layout_centerVertical="true"
-     android:paddingRight="5dp" android:paddingLeft="5dp"/>
-    
-    <LinearLayout android:id="@+id/callee_buttons" android:layout_alignParentRight="true" 
-    android:layout_width="wrap_content" android:layout_height="fill_parent"
-    android:layout_centerVertical="true">
-      <ImageButton android:id="@+id/addVideo" android:src="@drawable/conf_video"
-          android:visibility="gone"
-          android:layout_width="wrap_content" android:layout_height="wrap_content" />
-      <ImageButton android:id="@+id/merge_to_conference" android:src="@drawable/conf_merge"
-          android:visibility="gone"
-          android:layout_width="wrap_content" android:layout_height="wrap_content" />
-    </LinearLayout>
-
-	<LinearLayout android:id="@+id/callee_statuses" android:layout_toLeftOf="@id/callee_buttons"
-	  android:layout_width="wrap_content" android:layout_height="fill_parent"
-	  android:layout_centerVertical="true">
-	  	<TextView android:id="@+id/status_label" style="@style/callee_status" />
-	  	<ImageView android:id="@+id/callee_status_speeking" style="@style/callee_status" android:src="@drawable/conf_speaking" android:visibility="gone"/>
-	  	<ImageView android:id="@+id/callee_status_qos" style="@style/callee_status" android:src="@drawable/stat_sys_signal_0" android:visibility="gone"/> 
-		<ImageView android:id="@+id/callee_status_paused" style="@style/callee_status" android:src="@drawable/conf_status_paused" android:visibility="gone"/>
-		<ImageView android:id="@+id/callee_status_secured" style="@style/callee_status" android:src="@drawable/conf_secured" android:visibility="gone"/>
-		<ImageView android:id="@+id/callee_status_maybe_secured" style="@style/callee_status" android:src="@drawable/conf_maybe_secured" android:visibility="gone"/>
-		<ImageView android:id="@+id/callee_status_not_secured" style="@style/callee_status" android:src="@drawable/conf_not_secured" android:visibility="gone"/>
-      	<ImageView android:id="@+id/callee_status_details" style="@style/callee_status" android:src="@drawable/conf_details" android:visibility="gone"/>
-	</LinearLayout>
-
-
-    <LinearLayout android:id="@+id/callee_block" android:orientation="vertical"
-    	android:layout_toRightOf="@id/picture" android:layout_toLeftOf="@id/callee_statuses"
-    	android:layout_width="fill_parent" android:layout_height="fill_parent" 
-    	android:layout_centerVertical="true">
-      <TextView android:id="@+id/name" style="@style/callee_name" />
-      <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content">
-          <Chronometer android:id="@+id/callee_duration" style="@style/callee_address" 
-              android:paddingRight="10sp"/>
-          <TextView android:id="@+id/address" style="@style/callee_address" />
-      </LinearLayout>
-    </LinearLayout>
-
-
-</RelativeLayout>
diff --git a/res/layout/conf_callee_older_devices.xml b/res/layout/conf_callee_older_devices.xml
deleted file mode 100644
index e3d52dfee..000000000
--- a/res/layout/conf_callee_older_devices.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="fill_parent" android:layout_height="52sp"
-  android:background="@drawable/conf_callee_bg">
-  
-    <ImageView android:id="@+id/picture" android:layout_width="52sp"
-     android:src="@drawable/unknown_person" android:layout_height="52sp"
-     android:paddingRight="5dp" android:paddingLeft="5dp" android:scaleType="centerInside"/>
-
-
-    <LinearLayout android:id="@+id/callee_block" android:orientation="vertical"
-    	android:layout_toRightOf="@id/picture" android:layout_toLeftOf="@id/callee_statuses"
-    	android:layout_width="fill_parent" android:layout_height="52sp">
-      <TextView android:id="@+id/name" style="@style/callee_name" />
-      <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content">
-          <Chronometer android:id="@+id/callee_duration" style="@style/callee_address" 
-              android:paddingRight="10sp"/>
-          <TextView android:id="@+id/address" style="@style/callee_address" />
-      </LinearLayout>
-    </LinearLayout>
-
-
-
-    <LinearLayout android:id="@+id/callee_statuses"
-        android:layout_width="wrap_content" android:layout_height="wrap_content"
-        android:layout_alignParentRight="true" android:gravity="center_vertical">
-
-	<TextView android:id="@+id/status_label" style="@style/callee_status"
-		android:layout_height="fill_parent" />
-
-	<ImageView android:id="@+id/callee_status_speeking" style="@style/callee_status"
-	    android:src="@drawable/conf_speaking" android:visibility="gone"/>
-
-	<ImageView android:id="@+id/callee_status_qos" style="@style/callee_status"
-	    android:src="@drawable/stat_sys_signal_0" android:visibility="gone"/>
-
-	<ImageView android:id="@+id/callee_status_paused" style="@style/callee_status"
-		android:src="@drawable/conf_status_paused" android:visibility="gone" />
-
-	<ImageView android:id="@+id/callee_status_secured" style="@style/callee_status"
-	    android:src="@drawable/conf_secured" android:visibility="gone"/>
-	<ImageView android:id="@+id/callee_status_maybe_secured" style="@style/callee_status"
-	    android:src="@drawable/conf_maybe_secured" android:visibility="gone"/>
-	<ImageView android:id="@+id/callee_status_not_secured" style="@style/callee_status"
-	     android:src="@drawable/conf_not_secured" android:visibility="gone"/>
-
-	<ImageButton android:id="@+id/callee_status_details" style="@style/callee_status"
-	     android:src="@drawable/conf_details" android:visibility="gone"/>
-	</LinearLayout>
-</RelativeLayout>
diff --git a/res/layout/conf_choices_dialog.xml b/res/layout/conf_choices_dialog.xml
deleted file mode 100644
index f5e420f0e..000000000
--- a/res/layout/conf_choices_dialog.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-		android:layout_width="fill_parent" 
-		android:layout_height="fill_parent">
-
-<LinearLayout 
-	android:layout_width="fill_parent" android:layout_height="fill_parent"
-	android:orientation="vertical">
-
-    
-	<LinearLayout android:id="@+id/encrypted" android:visibility="gone"
-	android:layout_width="fill_parent" android:layout_height="wrap_content">
-	<ImageButton android:id="@+id/set_auth_token_verified" android:src="@drawable/conf_secured" android:visibility="gone"
-	    android:layout_width="wrap_content" android:layout_height="wrap_content" />
-	<ImageButton android:id="@+id/set_auth_token_not_verified" android:src="@drawable/conf_maybe_secured" android:visibility="gone"
-	    android:layout_width="wrap_content" android:layout_height="wrap_content" />
-	<TextView android:id="@+id/authentication_token" android:layout_gravity="center_vertical"
-	    android:layout_width="wrap_content" android:layout_height="wrap_content" />
-	</LinearLayout>
-	
-	<LinearLayout android:id="@+id/transfer_new"
-	android:layout_width="fill_parent" android:layout_height="wrap_content">
-	<ImageButton android:src="@drawable/conf_transfer" android:clickable="false" 
-		android:layout_width="wrap_content" android:layout_height="wrap_content" />
-	<TextView android:text="@string/conf_choice_transfer_new" android:layout_gravity="center_vertical"
-		android:layout_width="wrap_content" android:layout_height="wrap_content" />
-	</LinearLayout>
-
-	<LinearLayout android:id="@+id/transfer_existing"
-	android:layout_width="fill_parent" android:layout_height="wrap_content">
-	<ImageButton android:src="@drawable/conf_transfer" android:clickable="false"
-		android:layout_width="wrap_content" android:layout_height="wrap_content" />
-	<TextView android:text="@string/conf_choice_transfer_existing" android:layout_gravity="center_vertical"
-		android:layout_width="wrap_content" android:layout_height="wrap_content" />
-	</LinearLayout>
-
-	<LinearLayout android:id="@+id/merge_to_conference"
-	android:layout_width="fill_parent" android:layout_height="wrap_content">
-	<ImageButton android:src="@drawable/conf_merge" android:clickable="false"
-		android:layout_width="wrap_content"	android:layout_height="wrap_content" />
-	<TextView android:text="@string/conf_choice_merge_to_conference" android:layout_gravity="center_vertical"
-		android:layout_width="wrap_content" android:layout_height="wrap_content" />
-	</LinearLayout>
-
-	<LinearLayout android:id="@+id/terminate_call"
-	android:layout_width="fill_parent" android:layout_height="wrap_content">
-	<ImageButton android:src="@drawable/conf_terminate" android:clickable="false"
-		android:layout_width="wrap_content" android:layout_height="wrap_content" />
-	<TextView android:text="@string/conf_choice_terminate" android:layout_gravity="center_vertical"
-		android:layout_width="wrap_content" android:layout_height="wrap_content" />
-	</LinearLayout>
-
-</LinearLayout>
-</ScrollView>
\ No newline at end of file
diff --git a/res/layout/conf_details_participant_choices_dialog.xml b/res/layout/conf_details_participant_choices_dialog.xml
deleted file mode 100644
index f7a79b68e..000000000
--- a/res/layout/conf_details_participant_choices_dialog.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-		android:layout_width="fill_parent" 
-		android:layout_height="fill_parent">
-
-<LinearLayout 
-	android:layout_width="fill_parent" android:layout_height="fill_parent"
-	android:orientation="vertical">
-
-	<LinearLayout android:id="@+id/remove_from_conference"
-	android:layout_width="fill_parent" android:layout_height="wrap_content">
-	<ImageButton android:src="@drawable/conf_remove" android:clickable="false"
-		android:layout_width="wrap_content" android:layout_height="wrap_content" />
-	<TextView android:text="@string/conf_choice_remove_from_conference" android:layout_gravity="center_vertical"
-		android:layout_width="wrap_content" android:layout_height="wrap_content" />
-	</LinearLayout>
-
-
-	<LinearLayout android:id="@+id/terminate_call"
-	android:layout_width="fill_parent" android:layout_height="wrap_content">
-	<ImageButton android:src="@drawable/conf_terminate" android:clickable="false"
-		android:layout_width="wrap_content" android:layout_height="wrap_content" />
-	<TextView android:text="@string/conf_choice_terminate" android:layout_gravity="center_vertical"
-		android:layout_width="wrap_content" android:layout_height="wrap_content" />
-	</LinearLayout>
-
-</LinearLayout>
-</ScrollView>
\ No newline at end of file
diff --git a/res/layout/conference_details_layout.xml b/res/layout/conference_details_layout.xml
deleted file mode 100644
index 231719e79..000000000
--- a/res/layout/conference_details_layout.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
- <RelativeLayout
-         xmlns:android="http://schemas.android.com/apk/res/android"
-         xmlns:ui="http://schemas.android.com/apk/res-auto"
-         android:orientation="vertical"
-         android:layout_width="fill_parent"
-         android:layout_height="fill_parent">
-
-     <ListView android:id="@android:id/list"
-               android:layout_width="fill_parent"
-               android:layout_height="wrap_content"
-               android:drawSelectorOnTop="true"
-               android:dividerHeight="10dip"
-               android:divider="@android:color/transparent"
-               android:fadeScrollbars="false"
-     />
-
-
-
-     <LinearLayout android:id="@+id/conf_speaker_mic_row"
-			android:layout_alignParentBottom="true" 
-			android:layout_width="fill_parent" android:layout_height="wrap_content"> 
-		<org.linphone.ui.ToggleImageButton android:id="@+id/toggleMuteMic"
-	            style="@style/incall_control"
-				ui:checked="@drawable/incall_micro_inverse"
-				ui:unchecked="@drawable/incall_micro"
-				ui:bgdrawables="true" />
-
-		<ImageButton
-			android:id="@+id/incallHang"
-			style="@style/incall_control"
-			android:background="@drawable/clavier_bg"
-			android:src="@drawable/stopcall_red" />
-
-		<org.linphone.ui.ToggleImageButton android:id="@+id/toggleSpeaker"
-	            style="@style/incall_control"
-				ui:checked="@drawable/incall_speaker_inverse"
-				ui:unchecked="@drawable/incall_speaker"
-				ui:bgdrawables="true" />
-	</LinearLayout>
- </RelativeLayout>
diff --git a/res/layout/contact_picker.xml b/res/layout/contact_picker.xml
deleted file mode 100644
index 9ad7a12e1..000000000
--- a/res/layout/contact_picker.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical" android:layout_width="match_parent"
-	android:layout_height="match_parent">
-
-	<EditText android:id="@+id/contactFilter"
-		android:layout_height="wrap_content" android:hint="@string/filter_contacts"
-		android:layout_width="match_parent"></EditText>
-
-	<ListView android:id="@+id/contactList"
-		android:layout_width="match_parent"	android:layout_height="wrap_content"
-		android:layout_weight="1" />
-</LinearLayout>
diff --git a/res/layout/dialer.xml b/res/layout/dialer.xml
index 5b80a9f8c..e66ce2cd4 100644
--- a/res/layout/dialer.xml
+++ b/res/layout/dialer.xml
@@ -1,125 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/numpad_background"
+    android:orientation="vertical" >
     
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:linphone="http://schemas.android.com/apk/res/linphone"
-	android:orientation="vertical" android:layout_width="fill_parent"
-	android:layout_height="fill_parent">
-
-	<LinearLayout android:layout_height="wrap_content"
-		android:layout_width="fill_parent" android:id="@+id/Addresslayout">
-		
-		<org.linphone.ui.AddressText android:id="@+id/SipUri" android:background="@drawable/clavier_bg_grey" android:hint="sip:" android:layout_width="fill_parent"
-			android:singleLine="true"  android:lines="1" android:layout_weight="0.2" android:layout_height="fill_parent" android:padding="10px" android:maxLines="1" android:editable="@bool/allow_edit_in_dialer"/>
-		
-		<org.linphone.ui.EraseButton android:layout_height="fill_parent" android:background="@drawable/clavier_bg" android:id="@+id/Erase"
-			android:layout_width="fill_parent" android:layout_weight="0.8" android:textSize="20sp"
-			android:textStyle="bold" android:text="&lt;" android:layout_gravity="top" android:textColor="@android:color/black"/>
-		
-	</LinearLayout>
-		
-	<FrameLayout
-		android:layout_height="fill_parent" 
-		android:layout_width="fill_parent">
+    <org.linphone.ui.AddressText
+        android:id="@+id/Adress"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:textColor="@android:color/white"
+        android:textSize="22dp"
+        android:background="@drawable/champ_saisie_numero"
+        android:paddingLeft="20dp"
+        android:paddingRight="20dp"
+        android:layout_weight="0.4"
+       	android:layout_gravity="center" />
 	
-	    <LinearLayout
-			android:orientation="vertical" 
-			android:layout_width="fill_parent"
-			android:layout_height="fill_parent"
-			android:layout_marginBottom="23sp">
-			
-			<org.linphone.ui.Numpad 
-			    android:id="@+id/Dialer" 
-			    android:layout_width="fill_parent" 
-			    android:layout_height="fill_parent" 
-			    android:layout_weight="0.2" />
-		
-			<LinearLayout 
-			    android:layout_height="fill_parent" 
-			    android:orientation="vertical" 
-			    android:layout_width="fill_parent" 
-			    android:layout_weight="1">
-			    
-				<org.linphone.ui.CallButton 
-				    android:id="@+id/Call" 
-				    android:layout_height="fill_parent" 
-				    android:layout_width="fill_parent" 
-				    android:src="@drawable/startcall_green" 
-				    android:background="@drawable/clavier_bg" />
-				
-				<LinearLayout
-				    android:id="@+id/InCallControls"
-					android:layout_height="fill_parent" 
-					android:layout_width="fill_parent"
-					android:orientation="horizontal"
-					android:visibility="gone"  >
-					
-	                <Button 
-					    android:id="@+id/AddCall"
-					    style="@style/DialerDigit"
-						android:layout_height="fill_parent" 
-						android:layout_width="fill_parent" 
-						android:layout_weight="1" 
-						android:text="@string/AddCallButtonText" />
-	                
-					<Button 
-					    android:id="@+id/Back"
-					    style="@style/DialerDigit"
-						android:layout_height="fill_parent" 
-						android:layout_width="fill_parent" 
-						android:layout_weight="1" 
-						android:text="@string/CancelButtonText" />
-					
-				</LinearLayout>
-				
-			</LinearLayout>
-			
-		</LinearLayout>
-	
-		<org.linphone.ui.LockableSlidingDrawer
-			android:id="@+id/drawer"
-			android:layout_width="fill_parent"
-			android:layout_height="fill_parent"
-			android:handle="@+id/handle"
-			android:layout_weight="1"
-			android:content="@+id/accounts">
-			
-		    <LinearLayout
-		        android:id="@id/handle"
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:orientation="horizontal"
-				android:background="#000000"
-				android:gravity="center_vertical">
-		        
-		        <EditText 
-				    android:id="@+id/status_label" 
-				    android:clickable="false" 
-				    android:focusable="false" 
-				    android:cursorVisible="false" 
-				    android:textSize="12sp" 
-					android:background="#000000"
-				    android:layout_height="wrap_content" 
-				    android:layout_width="fill_parent" 
-				    android:layout_weight="4"
-				    android:textColor="@android:color/white" />
-		        
-		        <ImageView
-				    android:layout_height="wrap_content" 
-				    android:layout_width="fill_parent"
-				    android:layout_weight="100"
-				    android:src="@drawable/conf_details"/>
-		        
-		    </LinearLayout>
-			
-			<ListView
-				android:id="@id/accounts"
-				android:background="#CC000000"
-				android:layout_width="fill_parent"
-				android:layout_height="fill_parent" />
-			
-		</org.linphone.ui.LockableSlidingDrawer>
-	
-	</FrameLayout>
+    <org.linphone.ui.Numpad 
+	    android:id="@+id/Dialer" 
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="0.15" />
+    
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="0.4" >
+        
+        <ImageView
+            android:contentDescription="@string/content_description_add_contact"
+            android:id="@+id/addContact"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:scaleType="fitXY"
+            android:src="@drawable/add_contact" />
+        
+        <org.linphone.ui.CallButton
+            android:id="@+id/Call"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:scaleType="fitXY"
+            android:src="@drawable/appeler" />
+        
+        <org.linphone.ui.EraseButton
+            android:id="@+id/Erase"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:scaleType="fitXY"
+            android:src="@drawable/backspace" />
+        
+    </LinearLayout>
 	
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/first_login_view.xml b/res/layout/first_login_view.xml
deleted file mode 100644
index 225263010..000000000
--- a/res/layout/first_login_view.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android" 
-	a:layout_width="fill_parent" a:layout_height="fill_parent" a:orientation="vertical">
-
-
-       <EditText a:id="@+id/login"
-               a:hint="@string/first_login_username"
-               a:layout_width="wrap_content" a:layout_height="wrap_content"
-               a:layout_marginTop="20sp" a:layout_marginRight="15sp" a:layout_gravity="right"
-               a:width="180sp"/>
-
-       <EditText a:id="@+id/password" a:password="true"
-               a:hint="@string/first_login_password"
-               a:layout_width="wrap_content" a:layout_height="wrap_content"
-               a:layout_marginTop="10sp" a:layout_marginRight="15sp" a:layout_gravity="right"
-               a:width="180sp"/>
-
-       <Button a:id="@+id/connect" a:text="@string/first_login_connect"
-               a:layout_width="wrap_content" a:layout_height="wrap_content"
-               a:layout_marginTop="20sp" a:layout_marginRight="15sp" a:layout_gravity="right"
-               a:width="180sp"/>
-
-       <View a:layout_width="wrap_content" a:layout_height="wrap_content" a:layout_weight="1" />
-
-       <ProgressBar a:id="@+id/progress_bar"
-        a:layout_width="wrap_content" a:layout_height="wrap_content"
-        a:layout_gravity="center|bottom" a:layout_marginTop="50sp"
-        />
-        
-       <View a:layout_width="wrap_content" a:layout_height="wrap_content" a:layout_weight="1" />
-
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/hello_world.xml b/res/layout/hello_world.xml
deleted file mode 100644
index 25d396656..000000000
--- a/res/layout/hello_world.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_height="fill_parent" android:layout_width="fill_parent"
-	android:orientation="vertical">
-	<LinearLayout android:layout_width="wrap_content"
-		android:layout_height="wrap_content">
-		<EditText android:layout_height="wrap_content" android:id="@+id/AddressId"
-			android:hint="sip:user@host:port" android:layout_width="fill_parent"
-			android:layout_weight="1" android:text="sip:[user@]host[:port]"></EditText>
-		<Button android:layout_height="wrap_content" android:id="@+id/CallButton"
-			android:text="Call" android:layout_width="wrap_content"></Button>
-
-	</LinearLayout>
-	<EditText android:layout_height="wrap_content" android:id="@+id/MyAddressId"
-			android:hint="enter my sip identity (sip:[user@]host)" android:layout_width="fill_parent"
-			android:visibility="gone" android:text=""></EditText>
-	<EditText android:hint="my password" android:id="@+id/Password"
-		android:layout_width="fill_parent" android:layout_height="wrap_content"
-		 android:visibility="gone"></EditText>
-
-
-
-
-	<TextView android:layout_weight="1" android:layout_width="fill_parent"
-		android:layout_height="fill_parent" android:id="@+id/OutputText"
-		android:text="Debug"></TextView>
-
-	<Button android:text="STOP" android:id="@+id/ButtonStop"
-		android:layout_width="fill_parent" android:layout_height="wrap_content"></Button>
-
-</LinearLayout>
diff --git a/res/layout/history_cell.xml b/res/layout/history_cell.xml
index 108d35b06..9b2d19976 100644
--- a/res/layout/history_cell.xml
+++ b/res/layout/history_cell.xml
@@ -1,43 +1,48 @@
-<?xml version="1.0" encoding="utf-8"?> <!-- from Android Layout Tricks #1 -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent" android:layout_height="?android:attr/listPreferredItemHeight"
-	android:padding="6dip">
-	<FrameLayout 
-		android:layout_width="wrap_content" android:layout_height="wrap_content"
-		android:layout_alignParentTop="true"
-		android:layout_alignParentBottom="true" android:layout_marginRight="6dip"
-		android:id="@+id/history_cell_icon">
-		<ImageView android:id="@+id/history_cell_icon_contact"
-			android:layout_width="wrap_content" android:layout_height="fill_parent"
-			android:layout_alignParentTop="true"
-			android:layout_alignParentBottom="true" android:layout_marginRight="6dip"
-			android:scaleType="centerInside"/>
-		<ImageView android:id="@+id/history_cell_icon_in"
-			android:layout_width="wrap_content" android:layout_height="wrap_content"
-			android:layout_gravity="right|bottom" android:layout_marginRight="6dip"
-			android:src="@drawable/in_call_mini" android:scaleType="centerInside"/>
-		<ImageView android:id="@+id/history_cell_icon_out"
-			android:layout_width="wrap_content" android:layout_height="wrap_content"
-			android:layout_gravity="right|bottom" android:layout_marginRight="6dip"
-			android:src="@drawable/out_call_mini" android:scaleType="centerInside"/>
-	</FrameLayout>
-
-	<TextView android:id="@+id/history_cell_second_line"
-
-		android:layout_width="fill_parent" android:layout_height="26dip"
-
-		android:layout_toRightOf="@id/history_cell_icon"
-		android:layout_alignParentBottom="true"
-		android:layout_alignParentRight="true" android:singleLine="true"
-		android:ellipsize="marquee" />
-
-	<TextView android:id="@+id/history_cell_first_line"
-
-		android:layout_width="fill_parent" android:layout_height="wrap_content"
-
-		android:layout_toRightOf="@id/history_cell_icon"
-		android:layout_alignParentRight="true" android:layout_alignParentTop="true"
-		android:layout_above="@id/history_cell_second_line"
-		android:layout_alignWithParentIfMissing="true" android:gravity="center_vertical" />
-
-</RelativeLayout>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_vertical"
+    android:orientation="horizontal" >
+    
+    <ImageView 
+        android:contentDescription="@string/content_description_call_direction"
+	    android:id="@+id/icon"
+	    android:layout_width="match_parent"
+	    android:layout_height="wrap_content"
+	    android:layout_weight="0.9"
+	    android:src="@drawable/incoming_call"
+	    android:layout_marginLeft="10dp"/>
+	    
+	<TextView 
+	    android:id="@+id/sipUri"
+	    android:lines="1"
+	    android:layout_width="match_parent"
+	    android:layout_height="wrap_content"
+	    android:layout_weight="0.3"
+	    android:textAppearance="?android:attr/textAppearanceLarge"
+	    android:textColor="@android:color/black"
+	    android:layout_marginLeft="10dp" />
+	
+	<ImageView 
+        android:contentDescription="@string/content_description_detail"
+	    android:id="@+id/detail"
+	    android:layout_width="match_parent"
+	    android:layout_height="wrap_content"
+	    android:layout_weight="0.9"
+	    android:src="@drawable/detail"
+	    android:layout_marginLeft="10dp"
+	    android:layout_marginRight="10dp" />
+	
+	<ImageView 
+        android:contentDescription="@string/content_description_delete"
+	    android:id="@+id/delete"
+	    android:layout_width="match_parent"
+	    android:layout_height="wrap_content"
+	    android:layout_weight="0.9"
+	    android:visibility="gone"
+	    android:src="@drawable/delete"
+	    android:layout_marginLeft="10dp"
+	    android:layout_marginRight="10dp" />
+    
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/incall_layout.xml b/res/layout/incall_layout.xml
deleted file mode 100644
index a5bfa8ba9..000000000
--- a/res/layout/incall_layout.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
- <RelativeLayout
-     xmlns:android="http://schemas.android.com/apk/res/android"
-     xmlns:ui="http://schemas.android.com/apk/res-auto"
-     android:layout_width="match_parent"
-     android:layout_height="fill_parent"
-     android:orientation="vertical">
-
-	<LinearLayout android:id="@+id/conf_header" android:layout_alignParentTop="true"
-			android:layout_marginBottom="10dip"
-			android:layout_width="fill_parent" android:layout_height="wrap_content" 
-			android:layout_alignWithParentIfMissing="true"
-			android:minHeight="60sp"
-			android:background="@drawable/conf_callee_selector_normal" >
-      	<TextView android:text="@string/conf_conference" style="@style/callee_address"
-        	android:layout_width="fill_parent" android:layout_height="wrap_content" 
-        	android:gravity="center" android:layout_gravity="center_vertical" />
-      	<ImageButton android:id="@+id/conf_header_details"
-      	    android:layout_width="wrap_content" android:layout_height="fill_parent"
-      	    android:scaleType="center" android:src="@drawable/conf_details"/>
-	</LinearLayout>
-
-
-
-
-	<LinearLayout android:id="@+id/incall_controls_layout"
-		android:layout_alignParentBottom="true" android:orientation="vertical"
-		android:layout_width="fill_parent" android:layout_height="wrap_content">
-
-	<LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
-		<org.linphone.ui.ToggleImageButton android:id="@+id/toggleMuteMic"
-	            style="@style/incall_control"
-				ui:checked="@drawable/incall_micro_inverse"
-				ui:unchecked="@drawable/incall_micro"
-				ui:bgdrawables="true" />
-
-	        <ImageButton android:id="@+id/incallNumpadShow"
-	            style="@style/incall_control"
-				android:background="@drawable/incall_dialpad" />
-
-	        <org.linphone.ui.ToggleImageButton android:id="@+id/toggleSpeaker"
-	            style="@style/incall_control"
-				ui:checked="@drawable/incall_speaker_inverse"
-				ui:unchecked="@drawable/incall_speaker"
-				ui:bgdrawables="true" />
-	</LinearLayout>
-	
-	<LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
-			<ImageButton android:id="@+id/addCall"
-			    style="@style/incall_control"
-			    android:background="@drawable/incall_add" />
-
-	        <ImageButton android:id="@+id/conf_simple_merge"
-	            style="@style/incall_control"
-	            android:visibility="gone"
-	            android:background="@drawable/incall_merge" />
-
-	        <org.linphone.ui.ToggleImageButton android:id="@+id/conf_simple_pause"
-	            style="@style/incall_control"
-	            ui:checked="@drawable/incall_pause_inverse"
-				ui:unchecked="@drawable/incall_pause"
-				ui:bgdrawables="true" />
-
-	        <Button android:id="@+id/conf_simple_video"
-	            style="@style/incall_control"
-	            android:text="@string/conf_simple_video_bt_txt"
-	            android:background="@drawable/clavier_bg" />
-	</LinearLayout>
-
-	<ImageButton
-            android:id="@+id/incallHang"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:background="@drawable/clavier_bg"
-            android:minHeight="60dip"
-            android:src="@drawable/stopcall_red" />
-</LinearLayout>
-
-
-	<RelativeLayout android:id="@+id/picture_wrapper"
-	    android:layout_height="wrap_content" android:layout_width="fill_parent" 
-		android:layout_above="@id/incall_controls_layout">
-	<ImageView android:id="@+id/incall_picture" android:visibility="gone"
-	    android:layout_centerInParent="true" android:paddingBottom="8dip"
-		android:layout_height="wrap_content" android:layout_width="wrap_content" 
-		android:layout_gravity="center" android:scaleType="fitCenter"
-		android:minWidth="120dip" android:minHeight="120dip"
-	/>
-	</RelativeLayout>
-
-     <ListView android:id="@android:id/list"
-               android:layout_width="fill_parent"
-               android:layout_height="wrap_content"
-               android:drawSelectorOnTop="true"
-               android:dividerHeight="10dip"
-               android:divider="@android:color/transparent"
-               android:layout_below="@id/conf_header"
-               android:layout_above="@id/picture_wrapper"
-               android:layout_alignWithParentIfMissing="true"
-               android:fadeScrollbars="false"
-     />
- </RelativeLayout>
diff --git a/res/layout/incoming.xml b/res/layout/incoming.xml
index de9f8f09f..354b05863 100644
--- a/res/layout/incoming.xml
+++ b/res/layout/incoming.xml
@@ -1,55 +1,60 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout android:orientation="vertical"
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent" android:layout_height="fill_parent">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent" 
+	android:layout_height="match_parent"
+	android:background="@drawable/numpad_background">
 
-
-	<TextView android:id="@+id/incoming_text" 
-		android:layout_width="wrap_content" android:layout_height="wrap_content"
-		android:layout_centerHorizontal="true"
-		android:layout_marginTop="25sp" android:layout_alignParentTop="true"
-		android:text="Incoming call" android:textAppearance="?android:attr/textAppearanceLarge">
-	</TextView>
-
-	<LinearLayout android:layout_width="wrap_content"
-		android:layout_height="wrap_content" android:orientation="vertical"
-		android:layout_below="@id/incoming_text"
-		android:layout_centerHorizontal="true" android:paddingTop="30dip">
-		<ImageView android:id="@+id/incoming_picture"
-			android:layout_height="wrap_content" android:layout_width="wrap_content" 
-			android:layout_gravity="center" android:scaleType="fitCenter"
-			android:minWidth="128px" android:minHeight="128px"
-			android:paddingBottom="10sp"/>
-		<TextView android:id="@+id/incoming_caller_name"
-			android:layout_width="wrap_content" android:layout_height="wrap_content"
-			android:text="Caller name" android:textAppearance="?android:attr/textAppearanceLarge"
-			android:layout_gravity="center_horizontal">
-		</TextView>
-		<TextView android:id="@+id/incoming_caller_number"
-			android:layout_width="wrap_content" android:layout_height="wrap_content"
-			android:layout_marginTop="8sp"
-			android:text="Caller phone"
-			android:textAppearance="?android:attr/textAppearance"
-			android:layout_gravity="center_horizontal">
-		</TextView>
+	<LinearLayout 
+		android:layout_width="match_parent" 
+		android:layout_height="match_parent"
+		android:orientation="vertical">
+		
+	    <TextView
+		    android:id="@+id/incoming_caller_number"
+		    android:layout_width="match_parent"
+		    android:layout_height="match_parent"
+		    android:layout_weight="0.9"
+		    android:background="@drawable/champ_saisie_numero"
+		    android:gravity="center_vertical"
+        	android:paddingLeft="20dp"
+		    android:textColor="@android:color/white"
+		    android:textSize="22dp" />
+	
+		<LinearLayout 
+		    android:layout_width="match_parent"
+			android:layout_height="match_parent" 
+		    android:layout_weight="0.1"
+			android:orientation="vertical"
+			android:paddingTop="30dip">
+			
+			<ImageView 
+            	android:contentDescription="@string/content_description_contact_picture"
+			    android:id="@+id/incoming_picture"
+				android:layout_height="wrap_content" 
+				android:layout_width="wrap_content" 
+				android:layout_gravity="center" 
+				android:scaleType="fitCenter"
+				android:minWidth="128dp" 
+				android:minHeight="128dp"
+				android:paddingBottom="10sp" />
+			
+			<TextView 
+			    android:id="@+id/incoming_caller_name"
+				android:layout_width="wrap_content" 
+				android:layout_height="wrap_content"
+				android:textAppearance="?android:attr/textAppearanceLarge"
+				android:layout_gravity="center_horizontal" />
+	
+		</LinearLayout>
+		
 	</LinearLayout>
 
-
     <org.linphone.ui.SlidingTab
         android:id="@+id/sliding_widget"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_marginBottom="80dip"
         />
 
-
-<!--	<org.linphone.ui.CallButton  android:src="@drawable/startvideo_green" android:layout_width="wrap_content"-->
-<!--		android:layout_height="wrap_content" android:id="@+id/AnswerWithVideo"-->
-<!--		android:text="answer with video"-->
-<!--		android:textAppearance="?android:attr/textAppearanceLarge"-->
-<!--		android:layout_alignParentLeft="true" android:layout_marginBottom="30sp"-->
-<!--		android:layout_above="@id/Answer"/>-->
-
-
 </RelativeLayout>
diff --git a/res/layout/incoming_call.xml b/res/layout/incoming_call.xml
deleted file mode 100644
index adc5a351c..000000000
--- a/res/layout/incoming_call.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:linphone="http://schemas.android.com/apk/res/linphone"
-	android:orientation="vertical" android:layout_width="fill_parent"
-	android:layout_height="fill_parent">
-
-<!--	<View android:layout_height="0px" android:layout_width="0px" android:layout_weight="1" />-->
-
-	<LinearLayout android:layout_height="fill_parent" android:layout_width="fill_parent"
-	 android:gravity="bottom">
-		<org.linphone.ui.CallButton android:id="@+id/Call"
-		 android:layout_height="wrap_content" android:layout_width="fill_parent"
-		 android:layout_weight="0.25" android:src="@drawable/startcall_green" android:background="@drawable/clavier_bg"/>
-		<org.linphone.ui.HangCallButton android:id="@+id/Decline" 
-		 android:layout_height="wrap_content" android:layout_width="fill_parent"
-		 android:layout_weight="0.25" android:src="@drawable/stopcall_red" android:background="@drawable/clavier_bg"/>
-	</LinearLayout>
-</LinearLayout>
diff --git a/res/layout/main.xml b/res/layout/main.xml
index be34db025..9e42fa0fe 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -1,19 +1,109 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@+id/main_frame" android:layout_width="fill_parent"
-	android:layout_height="fill_parent">
-	<TabHost android:id="@android:id/tabhost" android:layout_width="fill_parent"
-		android:layout_height="fill_parent">
-		<LinearLayout android:orientation="vertical"
-			android:layout_width="fill_parent" android:layout_height="fill_parent">
-			<!--
-				android:padding="5dp"
-			-->
-			<TabWidget android:id="@android:id/tabs"
-				android:layout_width="fill_parent" android:layout_height="wrap_content" />
-			<FrameLayout android:id="@android:id/tabcontent"
-				android:layout_width="fill_parent" android:layout_height="fill_parent" />
-		</LinearLayout>
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+    
+    <!-- <ImageView 
+	    android:layout_width="match_parent"
+	    android:layout_height="match_parent"
+	    android:id="@+id/tutorial"/> -->
+    
+	<LinearLayout
+	    android:layout_width="match_parent"
+	    android:layout_height="match_parent" 
+	    android:weightSum="6"
+	    android:orientation="vertical">
+		
+	    <fragment android:name="org.linphone.StatusFragment"
+			android:id="@+id/status"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content" />
+		    
+	    
+	    <RelativeLayout
+		    android:layout_width="match_parent"
+		    android:layout_height="match_parent">
+	        
+			<LinearLayout
+			    android:id="@+id/fragmentContainer"
+			    android:layout_width="match_parent"
+			    android:layout_height="match_parent"
+			    android:paddingBottom="75dp"
+			    android:orientation="horizontal" />
+		    
+			<LinearLayout
+			    android:id="@+id/menu"
+			    android:layout_width="match_parent"
+			    android:layout_height="90dp"
+			    android:layout_alignParentBottom="true"
+			    android:orientation="horizontal">
+			    
+			    <RelativeLayout
+				    android:layout_width="match_parent"
+				    android:layout_height="wrap_content"
+			        android:layout_weight="0.2">
+			        
+				    <ImageView
+            			android:contentDescription="@string/content_description_history"
+				        android:id="@+id/history"
+				        android:layout_width="match_parent"
+				        android:layout_height="wrap_content"
+				        android:scaleType="fitXY"
+				        android:src="@drawable/history" />
+				    
+				    <TextView 
+				        android:id="@+id/missedCalls"
+				        android:layout_width="25dp"
+				        android:layout_height="25dp"
+				        android:gravity="center"
+				        android:textSize="20dp"
+				        android:visibility="gone"
+				        android:layout_alignParentTop="true"
+				        android:layout_alignParentRight="true"
+				        android:background="@drawable/missed_calls_bg" />
+			    
+			    </RelativeLayout>
+			    
+			    <ImageView
+            		android:contentDescription="@string/content_description_contacts"
+			        android:id="@+id/contacts"
+			        android:layout_width="match_parent"
+			        android:layout_height="match_parent"
+			        android:layout_weight="0.2"
+			        android:scaleType="fitXY"
+			        android:src="@drawable/contacts" />
+		
+			    <ImageView
+            		android:contentDescription="@string/content_description_dialer"
+			        android:id="@+id/dialer"
+			        android:layout_width="match_parent"
+			        android:layout_height="match_parent"
+			        android:layout_weight="0.2"
+			        android:scaleType="fitXY"
+			        android:src="@drawable/dialer" />
+		
+			    <ImageView
+            		android:contentDescription="@string/content_description_settings"
+			        android:id="@+id/settings"
+			        android:layout_width="match_parent"
+			        android:layout_height="match_parent"
+			        android:layout_weight="0.2"
+			        android:scaleType="fitXY"
+			        android:src="@drawable/settings" />
+		
+				<ImageView
+            		android:contentDescription="@string/content_description_chat"
+				    android:id="@+id/chat"
+				    android:layout_width="match_parent"
+				    android:layout_height="match_parent"
+				    android:layout_weight="0.2"
+				    android:scaleType="fitXY"
+				    android:src="@drawable/chat" />
+			    
+			</LinearLayout>
+		
+		</RelativeLayout>
+			    
+	</LinearLayout>
 
-	</TabHost>
 </FrameLayout>
\ No newline at end of file
diff --git a/res/layout/numpad.xml b/res/layout/numpad.xml
index 9e65e4805..8ed3fb8ae 100644
--- a/res/layout/numpad.xml
+++ b/res/layout/numpad.xml
@@ -4,28 +4,29 @@
 		android:layout_width="fill_parent" android:layout_height="fill_parent"  android:layout_weight="1">
 
 	<TableRow android:layout_weight="1">
-		<org.linphone.ui.Digit android:id="@+id/Digit1"	android:text="1" style="@style/DialerDigit" />
-		<org.linphone.ui.Digit android:id="@+id/Digit2"	android:text="2" style="@style/DialerDigit" />
-		<org.linphone.ui.Digit android:id="@+id/Digit3"	android:text="3" style="@style/DialerDigit" />
+		<org.linphone.ui.Digit android:id="@+id/Digit1"	android:text="1" style="@style/DialerDigit" android:background="@drawable/numpad_one" />
+		<org.linphone.ui.Digit android:id="@+id/Digit2"	android:text="2" style="@style/DialerDigit" android:background="@drawable/numpad_two" />
+		<org.linphone.ui.Digit android:id="@+id/Digit3"	android:text="3" style="@style/DialerDigit" android:background="@drawable/numpad_three" />
 	</TableRow>
 	
 	<TableRow android:layout_weight="1">
-		<org.linphone.ui.Digit android:id="@+id/Digit4"	android:text="4" style="@style/DialerDigit" />
-		<org.linphone.ui.Digit android:id="@+id/Digit5"	android:text="5" style="@style/DialerDigit" />
-		<org.linphone.ui.Digit android:id="@+id/Digit6"	android:text="6" style="@style/DialerDigit" />
+		<org.linphone.ui.Digit android:id="@+id/Digit4"	android:text="4" style="@style/DialerDigit" android:background="@drawable/numpad_four" />
+		<org.linphone.ui.Digit android:id="@+id/Digit5"	android:text="5" style="@style/DialerDigit" android:background="@drawable/numpad_five" />
+		<org.linphone.ui.Digit android:id="@+id/Digit6"	android:text="6" style="@style/DialerDigit" android:background="@drawable/numpad_six" />
 	</TableRow>
 	
 	<TableRow android:layout_weight="1">
-		<org.linphone.ui.Digit android:id="@+id/Digit7"	android:text="7" style="@style/DialerDigit" />
-		<org.linphone.ui.Digit android:id="@+id/Digit8"	android:text="8" style="@style/DialerDigit" />
-		<org.linphone.ui.Digit android:id="@+id/Digit9"	android:text="9" style="@style/DialerDigit" />
+		<org.linphone.ui.Digit android:id="@+id/Digit7"	android:text="7" style="@style/DialerDigit" android:background="@drawable/numpad_seven" />
+		<org.linphone.ui.Digit android:id="@+id/Digit8"	android:text="8" style="@style/DialerDigit" android:background="@drawable/numpad_eight" />
+		<org.linphone.ui.Digit android:id="@+id/Digit9"	android:text="9" style="@style/DialerDigit" android:background="@drawable/numpad_nine" />
 	</TableRow>
 	
 	<TableRow android:layout_weight="1">
-		<org.linphone.ui.Digit android:id="@+id/DigitStar" android:text="*" style="@style/DialerDigit" />
-		<org.linphone.ui.Digit android:id="@+id/Digit00" android:text="0+" style="@style/DialerDigit" />
-		<org.linphone.ui.Digit android:id="@+id/DigitHash" android:text="#" style="@style/DialerDigit" />
+		<org.linphone.ui.Digit android:id="@+id/DigitStar" android:text="*"  style="@style/DialerDigit" android:background="@drawable/numpad_star" />
+		<org.linphone.ui.Digit android:id="@+id/Digit00"   android:text="0+" style="@style/DialerDigit" android:background="@drawable/numpad_zero" />
+		<org.linphone.ui.Digit android:id="@+id/DigitHash" android:text="#"  style="@style/DialerDigit" android:background="@drawable/numpad_sharp" />
 	</TableRow>
+	
 </TableLayout>
 <!-- android:layout_width="fill_parent" android:layout_height="fill_parent" android:textColor="@android:color/black" android:background="@drawable/clavier_bg" android:textStyle="bold" android:textSize="20sp" android:layout_weight="1" -->
         
\ No newline at end of file
diff --git a/res/layout/ring.xml b/res/layout/ring.xml
deleted file mode 100644
index 21e0e01bc..000000000
--- a/res/layout/ring.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="fill_parent"
-  android:layout_height="fill_parent">
-</LinearLayout>
diff --git a/res/layout/simplified_dialer.xml b/res/layout/simplified_dialer.xml
deleted file mode 100644
index 7159abdb1..000000000
--- a/res/layout/simplified_dialer.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:linphone="http://schemas.android.com/apk/res-auto"
-	android:orientation="vertical" android:layout_width="fill_parent"
-	android:layout_height="fill_parent">
-
-	<LinearLayout android:layout_height="wrap_content"
-		android:layout_width="fill_parent" android:id="@+id/Addresslayout">
-		<org.linphone.ui.AddressText android:id="@+id/SipUri"
-			android:background="@drawable/clavier_bg_grey" android:hint="sip:"
-			android:layout_width="fill_parent" android:singleLine="true" android:lines="1"
-			android:layout_weight="0.2" android:layout_height="fill_parent"
-			android:padding="10px" android:maxLines="1" android:editable="@bool/allow_edit_in_dialer" />
-		<org.linphone.ui.EraseButton
-			android:layout_height="fill_parent" android:background="@drawable/clavier_bg"
-			android:id="@+id/Erase" android:layout_width="fill_parent"
-			android:layout_weight="0.8" android:textSize="20sp"
-			android:textStyle="bold" android:text="&lt;" android:layout_gravity="top"
-			android:textColor="@android:color/black" />
-	</LinearLayout>
-
-	<org.linphone.ui.Numpad android:id="@+id/Dialer"
-		linphone:play_dtmf="dont"
-		android:layout_width="fill_parent" android:layout_height="fill_parent"
-		android:layout_weight="4" />
-
-	<Button android:id="@+id/AddCallButton"
-		android:gravity="bottom|center_horizontal" android:layout_height="wrap_content"
-		android:layout_width="fill_parent" android:background="@drawable/clavier_bg" />
-
-</LinearLayout>
diff --git a/res/layout/uri_picker.xml b/res/layout/uri_picker.xml
deleted file mode 100644
index be34db025..000000000
--- a/res/layout/uri_picker.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@+id/main_frame" android:layout_width="fill_parent"
-	android:layout_height="fill_parent">
-	<TabHost android:id="@android:id/tabhost" android:layout_width="fill_parent"
-		android:layout_height="fill_parent">
-		<LinearLayout android:orientation="vertical"
-			android:layout_width="fill_parent" android:layout_height="fill_parent">
-			<!--
-				android:padding="5dp"
-			-->
-			<TabWidget android:id="@android:id/tabs"
-				android:layout_width="fill_parent" android:layout_height="wrap_content" />
-			<FrameLayout android:id="@android:id/tabcontent"
-				android:layout_width="fill_parent" android:layout_height="fill_parent" />
-		</LinearLayout>
-
-	</TabHost>
-</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/videocall.xml b/res/layout/videocall.xml
deleted file mode 100755
index 268cf08d6..000000000
--- a/res/layout/videocall.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:id="@+id/video_frame"
-  android:layout_height="fill_parent" android:layout_width="fill_parent">
-  
-<org.linphone.mediastream.video.display.GL2JNIView android:visibility="visible" android:layout_height="fill_parent" android:layout_width="fill_parent" android:id="@+id/video_surface"></org.linphone.mediastream.video.display.GL2JNIView>
-<SurfaceView 
-android:layout_height="88dip" 
-android:layout_width="72dip" 
-android:id="@+id/video_capture_surface" 
-android:layout_alignParentBottom="true"
-android:layout_alignParentRight="true"
-android:layout_marginBottom="15dip"
-android:layout_marginRight="15dip" >
-</SurfaceView>
-
-<ImageView 
-android:layout_width="72dip"
-android:layout_height="88dip" 
-android:id="@+id/imageView1" 
-android:src="@drawable/video_muted" 
-android:layout_alignParentBottom="true"
-android:layout_alignParentRight="true"
-android:layout_marginBottom="15dip"
-android:layout_marginRight="15dip" >
-</ImageView>
- 
-<ImageView 
-android:layout_width="wrap_content"
-android:layout_height="wrap_content" 
-android:id="@+id/QoS" 
-android:src="@drawable/stat_sys_signal_0" 
-android:layout_alignParentBottom="true"
-android:layout_alignParentLeft="true" >
-</ImageView> 
-
- </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/wizard.xml b/res/layout/wizard.xml
index 25dd1f314..e73d10124 100644
--- a/res/layout/wizard.xml
+++ b/res/layout/wizard.xml
@@ -25,7 +25,7 @@
             android:id="@+id/wizardUsernameOk"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/notok" />
+            android:src="@drawable/wizard_notok" />
 
     </LinearLayout>
 
@@ -62,7 +62,7 @@
             android:id="@+id/wizardPasswordOk"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/notok" />
+            android:src="@drawable/wizard_notok" />
 
     </LinearLayout>
 
@@ -83,7 +83,7 @@
             android:id="@+id/wizardEmailOk"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/notok" />
+            android:src="@drawable/wizard_notok" />
 
     </LinearLayout>
     
diff --git a/res/menu/history_activity_menu.xml b/res/menu/history_activity_menu.xml
deleted file mode 100644
index f1d6161a1..000000000
--- a/res/menu/history_activity_menu.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu
-  xmlns:android="http://schemas.android.com/apk/res/android">
-<item android:title="@string/menu_clear_history" android:id="@+id/menu_clear_history">
-</item>
-</menu>
diff --git a/res/menu/linphone_activity_menu.xml b/res/menu/linphone_activity_menu.xml
deleted file mode 100644
index 415be3aa9..000000000
--- a/res/menu/linphone_activity_menu.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu
-  xmlns:android="http://schemas.android.com/apk/res/android">
-<item android:title="@string/menu_settings" android:id="@+id/menu_settings">
-</item>
-<item android:title="@string/menu_exit" android:id="@+id/menu_exit"></item>
-<item android:id="@+id/menu_about" android:title="@string/menu_about"></item>
-</menu>
diff --git a/res/menu/videocall_activity_menu.xml b/res/menu/videocall_activity_menu.xml
deleted file mode 100644
index 88dca9776..000000000
--- a/res/menu/videocall_activity_menu.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu
-  xmlns:android="http://schemas.android.com/apk/res/android">
-
-
-
-<item android:id="@+id/videocall_menu_toggle_camera" android:title="@string/menu_videocall_toggle_camera_title"></item>
-<item android:id="@+id/videocall_menu_terminate_call" android:title="@string/menu_videocall_terminate_call_title"></item>
-<item android:id="@+id/videocall_menu_change_resolution" android:title="@string/menu_videocall_change_resolution_title"></item>
-<item android:id="@+id/videocall_menu_back_to_dialer" android:title="@string/menu_videocall_back_to_dialer_title"></item>
-<item android:title="@string/menu_videocall_switch_camera_title" android:id="@+id/videocall_menu_switch_camera"></item>
-</menu>
diff --git a/res/raw-xlarge/linphonerc b/res/raw-xlarge/linphonerc
deleted file mode 100644
index e6b2f09da..000000000
--- a/res/raw-xlarge/linphonerc
+++ /dev/null
@@ -1,52 +0,0 @@
-[net]
-download_bw=512
-upload_bw=512
-firewall_policy=0
-mtu=1300
-#adaptive_rate_control=1
-
-[sip]
-sip_port=5060
-sip_random_port=1
-guess_hostname=1
-contact=sip:unknown@unknown-host
-inc_timeout=15
-use_info=0
-use_ipv6=0
-register_only_when_network_is_up=1
-default_proxy=0
-auto_net_state_mon=0
-keepalive_period=30000
-auto_answer_replacing_calls=1
-media_encryption=zrtp
-media_encryption_mandatory=0
-
-[rtp]
-audio_rtp_port=7076
-video_rtp_port=9078
-audio_jitt_comp=60
-video_jitt_comp=60
-nortp_timeout=30
-
-[sound]
-playback_dev_id=ANDROID SND: Android Sound card
-ringer_dev_id=ANDROID SND: Android Sound card
-capture_dev_id=ANDROID SND: Android Sound card
-remote_ring=/data/data/org.linphone/files/ringback.wav
-local_ring=/data/data/org.linphone/files/oldphone_mono.wav
-ec_tail_len=120
-ec_framesize=128
-
-el_type=mic
-el_thres=0.03
-el_force=100000
-el_sustain=600
-el_transmit_thres=1.7
-ng_floorgain=0.01
-
-
-[video]
-size=vga
-
-[misc]
-max_calls=10
diff --git a/res/values/callee_style.xml b/res/values/callee_style.xml
deleted file mode 100644
index 7107e9915..000000000
--- a/res/values/callee_style.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="callee_name" parent="@android:style/TextAppearance.Large">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">fill_parent</item>
-        <item name="android:layout_weight">1</item>
-        <item name="android:gravity">fill_vertical</item>
-        <item name="android:singleLine">true</item>
-        <item name="android:ellipsize">marquee</item>
-    </style>
-
-    <style name="callee_address" parent="@android:style/TextAppearance.Medium">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">fill_parent</item>
-        <item name="android:layout_weight">1</item>
-        <item name="android:gravity">fill_vertical</item>
-        <item name="android:singleLine">true</item>
-        <item name="android:ellipsize">marquee</item>
-    </style>
-
-	<style name="callee_status" parent="@android:style/TextAppearance.Medium">
-		<item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:gravity">center_vertical</item>
-        <item name="android:layout_gravity">center_vertical</item>
-        <item name="android:scaleType">center</item>
-	</style>
-
-	<style name="conf_toggle_button" parent="@android:style/Widget.Button.Toggle">
-		<item name="android:width">0px</item>
-		<item name="android:layout_width">fill_parent</item>
-		<item name="android:layout_height">wrap_content</item>
-		<item name="android:layout_weight">1</item>
-<!--		<item name="android:layout_width">wrap_content</item>-->
-<!--        <item name="android:layout_height">wrap_content</item>-->
-	</style> 
-
-</resources>
\ No newline at end of file
diff --git a/res/values/conf_style.xml b/res/values/conf_style.xml
deleted file mode 100644
index 58d1109d8..000000000
--- a/res/values/conf_style.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="conf_icon_text_button" parent="@android:style/Widget.Button">
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_width">0dip</item>
-        <item name="android:layout_weight">1</item>
-        <item name="android:gravity">bottom|center_horizontal</item>
-        <item name="android:paddingLeft">15sp</item>
-        <item name="android:paddingRight">15sp</item>
-    </style>
-
-    <style name="incall_control" parent="@android:style/Widget.ImageButton">
-        <item name="android:layout_height">65dip</item>
-        <item name="android:layout_width">fill_parent</item>
-        <item name="android:layout_weight">1</item>
-        <item name="android:background">@android:color/transparent</item>
-    </style>
-
-   <declare-styleable name="ToggleImageButton">
-        <attr name="android:scaleType" />
-        <attr name="android:height" />
-        <attr name="android:width" />
-        <attr name="android:layout_width" />
-        <attr name="android:layout_height" />
-        <attr name="android:layout_weight" />
-        <attr name="android:id" />
-        <attr name="checked" format="integer" />
-        <attr name="unchecked" format="integer" />
-        <attr name="bgdrawables" format="boolean" />
-   </declare-styleable>
-</resources>
diff --git a/res/values/custom.xml b/res/values/custom.xml
index 8f4ef1b67..7d53397f5 100644
--- a/res/values/custom.xml
+++ b/res/values/custom.xml
@@ -2,7 +2,7 @@
 <resources>
 
 
-	<string name="app_name">Linphone</string>
+	<string name="app_name">Linphone 2</string>
 	<string name="notification_title">Linphone</string>
 	<string name="wait_dialog_text">Starting up</string>
 	<string name="notification_registered">Registered to %s </string> 
diff --git a/res/values/digit_style.xml b/res/values/digit_style.xml
index 60a163c72..7b668bd94 100644
--- a/res/values/digit_style.xml
+++ b/res/values/digit_style.xml
@@ -3,15 +3,11 @@
     <style name="DialerDigit" parent="@android:style/TextAppearance.Medium">
         <item name="android:layout_width">fill_parent</item>
         <item name="android:layout_height">fill_parent</item>
-        <item name="android:textColor">@android:color/black</item>
-        <item name="android:background">@drawable/clavier_bg</item>
-        <item name="android:textStyle">bold</item>
+        <item name="android:textColor">@android:color/transparent</item>
         <item name="android:textSize">20sp</item>
         <item name="android:layout_weight">1</item>
     </style>
 
-
-
 	<declare-styleable name="Numpad">
 		<attr name="play_dtmf">
 			<enum name="dont" value="0" />
diff --git a/res/values/non_localizable_custom.xml b/res/values/non_localizable_custom.xml
index bec3e38b4..ba9d59ddb 100644
--- a/res/values/non_localizable_custom.xml
+++ b/res/values/non_localizable_custom.xml
@@ -4,23 +4,17 @@
 
 	<string name="default_domain">test.linphone.org</string>
 
-	<bool name="use_android_contact_picker">true</bool>
-    <bool name="disable_dialer_sliding_drawer">false</bool>
+	<!-- Interface settings -->
     <bool name="hide_camera_settings">false</bool>
     <bool name="hide_wizard">false</bool>
     <bool name="hide_accounts">false</bool>
     <bool name="hide_add_account_button">false</bool> <!-- Accounts have to be displayed to show add account button -->
 	<bool name="useFirstLoginActivity">false</bool>
-	<bool name="useMenuSettings">true</bool>
-	<bool name="useMenuAbout">true</bool>
+	<bool name="disable_animations">false</bool>
 	<bool name="show_full_remote_address_on_incoming_call">true</bool>
-	<bool name="show_only_username_in_history">false</bool>
 
 	<bool name="allow_transfers">true</bool>
-
 	<bool name="allow_edit_in_dialer">true</bool>
-	<color name="conf_active_bg_color">#191970</color>
-
 	<bool name="forbid_self_call">false</bool>
 	<string name="about_bugreport_email">linphone-android@belledonne-communications.com</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3ee1e4190..fae721f0e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -263,4 +263,40 @@
 <string name="pref_help_outbound_proxy">Route all calls through SIP proxy</string>
 <string name="pref_help_username">Example: john if your account is john@sip.linphone.org</string>
 <string name="pref_help_domain">sip.linphone.org if your account is john@sip.linphone.org</string>
+
+<string name="chat">Chat</string>
+<string name="add_to_contacts">Add to contacts</string>
+<string name="status_connected">CONNECTED</string>
+<string name="status_not_connected">NOT CONNECTED</string>
+
+<!-- Used by Android to help blind people by describing them images -->
+<string name="content_description_add_contact">Add to contacts button</string>
+<string name="content_description_chat"></string>
+<string name="content_description_dial_back"></string>
+<string name="content_description_contact_picture"></string>
+<string name="content_description_send_message"></string>
+<string name="content_description_detail"></string>
+<string name="content_description_delete"></string>
+<string name="content_description_new_discussion"></string>
+<string name="content_description_edit"></string>
+<string name="content_description_validate"></string>
+<string name="content_description_all_contacts"></string>
+<string name="content_description_linphone_contacts"></string>
+<string name="content_description_call_direction"></string>
+<string name="content_description_all_calls"></string>
+<string name="content_description_missed_calls"></string>
+<string name="content_description_switch_video"></string>
+<string name="content_description_toggle_speaker"></string>
+<string name="content_description_toggle_micro"></string>
+<string name="content_description_add_call"></string>
+<string name="content_description_pause"></string>
+<string name="content_description_hang_up"></string>
+<string name="content_description_numpad"></string>
+<string name="content_description_settings"></string>
+<string name="content_description_dialer"></string>
+<string name="content_description_history"></string>
+<string name="content_description_contacts"></string>
+<string name="content_description_led"></string>
+<string name="content_description_call_quality"></string>
+<string name="content_description_encryption"></string>
 </resources>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 53f16a8bf..deb42c33b 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <Preference android:title="@string/menu_exit"></Preference>
 
 	<PreferenceCategory android:title="@string/pref_sipaccounts">
 		<!--<EditTextPreference android:title="@string/pref_username"
diff --git a/src/org/linphone/AboutActivity.java b/src/org/linphone/AboutActivity.java
deleted file mode 100644
index 763052e29..000000000
--- a/src/org/linphone/AboutActivity.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
-AboutActivity.java
-Copyright (C) 2010  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 java.io.BufferedReader;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStreamReader;
-
-import org.linphone.core.Log;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Handler;
-import android.preference.PreferenceManager;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.TextView;
-import android.widget.Toast;
-
-
-
-public class AboutActivity extends Activity implements OnClickListener {
-
-	private Handler mHandler = new Handler();
-
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.about);
-
-		TextView aboutText = (TextView) findViewById(R.id.AboutText);
-		try {
-			aboutText.setText(String.format(getString(R.string.about_text), getPackageManager().getPackageInfo(getPackageName(), 0).versionName));
-		} catch (NameNotFoundException e) {
-			Log.e(e, "cannot get version name");
-		}
-
-		SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(this);
-		if (pref.getBoolean(getString(R.string.pref_debug_key), false)) {
-			View issue = findViewById(R.id.about_report_issue);
-			issue.setOnClickListener(this);
-			issue.setVisibility(View.VISIBLE);
-		}
-	}
-
-	private Thread thread;
-	@Override
-	public void onClick(View v) {
-		if (thread != null) return;
-		Toast.makeText(this, getString(R.string.about_reading_logs), Toast.LENGTH_LONG).show();
-		thread = new ReadLogThread();
-		thread.start();
-	}
-
-	private File writeLogs(String logs, File directory) {
-		File tempFile = null;
-		try {
-			tempFile = File.createTempFile("bugreport", ".txt", directory);
-			tempFile.deleteOnExit();
-			FileWriter writer = new FileWriter(tempFile);
-			writer.append(logs);
-			return tempFile;
-		} catch (IOException e) {
-			Toast.makeText(this, getString(R.string.about_error_generating_bugreport_attachement), Toast.LENGTH_LONG).show();
-			Log.e(e, "couldn't write to temporary file");
-			return null;
-		}
-	}
-
-	private void onLogsRead(String logs) {
-		if (logs == null) {
-			Toast.makeText(this, getString(R.string.about_logs_not_found), Toast.LENGTH_SHORT).show();
-		} else {
-			File tempFile = writeLogs(logs, null);
-			if (tempFile == null) {
-				// If writing to temporary file to default location failed
-				// Write one to our storage place
-				tempFile = writeLogs(logs, getFilesDir());
-			}
-
-			Intent intent = new Intent(Intent.ACTION_SEND);
-			intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-			intent.setType("plain/text");
-			intent.putExtra(Intent.EXTRA_EMAIL, new String[]{getString(R.string.about_bugreport_email)});
-			intent.putExtra(Intent.EXTRA_SUBJECT,"Bug report " + getString(R.string.app_name) + "-android");
-			intent.putExtra(Intent.EXTRA_TEXT, getString(R.string.about_bugreport_email_text));
-			intent.putExtra(Intent.EXTRA_STREAM, Uri.fromFile(tempFile));
-			intent = Intent.createChooser(intent,getString(R.string.about_mailer_chooser_text));
-			startActivityForResult(intent, 0);
-		}
-	}
-
-
-	private class ReadLogThread extends Thread {
-		@Override
-		public void run() {
-			final String logs = readLogs();
-			mHandler.post(new Runnable() {
-				@Override
-				public void run() {
-					onLogsRead(logs);
-					thread=null;
-				}
-			});
-			super.run();
-		}
-	}
-
-	private String readLogs() {
-		StringBuilder sb1 = null;
-		StringBuilder sb2 = null;
-		BufferedReader br = null;
-		Process p = null;
-
-		try {
-			p = Runtime.getRuntime().exec(new String[] {"logcat", "-d"});
-			br = new BufferedReader(new InputStreamReader(p.getInputStream()), 1024);
-
-			String line;
-			while ((line = br.readLine()) != null) {
-				if (line.contains(LinphoneService.START_LINPHONE_LOGS)) {
-					if (sb1 != null) {
-						sb2 = sb1;
-					}
-					sb1 = new StringBuilder();
-				}
-				if (sb1 != null) {
-					sb1.append(line).append('\n');
-				}
-			}
-
-			if (sb1 == null) return null;
-			if (sb2 != null) {
-				sb1.append(sb2);
-			}
-			return sb1.toString();
-		} catch (IOException e) {
-			Log.e(e, "Error while reading logs");
-			return null;
-		} finally {
-			if (br != null) {
-				try {
-					br.close();
-				} catch (IOException e) {}
-			}
-			if (p != null) {
-				p.destroy();
-			}
-		}
-	}
-	
-}
diff --git a/src/org/linphone/AbstractCalleesActivity.java b/src/org/linphone/AbstractCalleesActivity.java
deleted file mode 100644
index 9c2058d8f..000000000
--- a/src/org/linphone/AbstractCalleesActivity.java
+++ /dev/null
@@ -1,330 +0,0 @@
-/*
-ConferenceActivity.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 java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.linphone.LinphoneSimpleListener.LinphoneOnAudioChangedListener;
-import org.linphone.LinphoneSimpleListener.LinphoneOnCallStateChangedListener;
-import org.linphone.core.LinphoneAddress;
-import org.linphone.core.LinphoneCall;
-import org.linphone.core.LinphoneCall.State;
-import org.linphone.core.LinphoneCore;
-import org.linphone.core.Log;
-import org.linphone.ui.ToggleImageButton;
-
-import android.app.ListActivity;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.SystemClock;
-import android.text.TextUtils;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.BaseAdapter;
-import android.widget.Checkable;
-import android.widget.Chronometer;
-import android.widget.ImageView;
-
-/**
- * @author Guillaume Beraudo
- *
- */
-public abstract class AbstractCalleesActivity extends ListActivity implements LinphoneOnCallStateChangedListener, OnClickListener, LinphoneOnAudioChangedListener {
-
-	private CalleeListAdapter mListAdapter;
-	private List<LinphoneCall> mSpecificCalls = Collections.emptyList();
-	private Handler mHandler = new Handler();
-
-	private Checkable mMuteMicButton;
-	private Checkable mSpeakerButton;
-
-	protected abstract boolean isActive();
-	protected abstract void setActive(boolean active);
-
-	protected abstract List<LinphoneCall> updateSpecificCallsList();
-
-	private Set<Chronometer> mChronometers = new HashSet<Chronometer>();
-	
-	private Handler callqualityHandler;
-	private List<View> viewsToUpdateCallQuality;
-	private boolean shouldDisplayWhoIsTalking = false;
-	@Override
-	/**
-	 * Called by the child classes AFTER their own onCreate.
-	 */
-	protected void onCreate(Bundle savedInstanceState) {
-		if (finishIfAutoRestartAfterACrash(savedInstanceState)) {
-			return;
-		}
-		setListAdapter(mListAdapter = createCalleeListAdapter());
-
-		View muteMic = findViewById(R.id.toggleMuteMic);
-		muteMic.setOnClickListener(this);
-		mMuteMicButton = (Checkable) muteMic;
-
-		View speaker =  findViewById(R.id.toggleSpeaker);
-		speaker.setOnClickListener(this);
-		mSpeakerButton = (Checkable) speaker;
-		if (LinphoneManager.getInstance().isSpeakerOn()) {
-			((ToggleImageButton) speaker).setChecked(true);
-		}
-		super.onCreate(savedInstanceState);
-	}
-
-	protected abstract CalleeListAdapter createCalleeListAdapter();
-
-	protected final boolean finishIfAutoRestartAfterACrash(Bundle savedInstanceState) {
-		if (!LinphoneManager.isInstanciated() || LinphoneManager.getLc().getCallsNb() == 0) {
-			if (!LinphoneManager.isInstanciated()) {
-				Log.e("No service running: avoid crash by finishing ", this.getClass().getName());
-			}
-			super.onCreate(savedInstanceState);
-			finish();
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	protected void onResume() {
-		mSpecificCalls = updateSpecificCallsList();
-		if (shouldFinishCalleeActivity()) {
-			finish();
-		} else {
-			setActive(true);
-			updateUI();
-			mSpeakerButton.setChecked(LinphoneManager.getInstance().isSpeakerOn());
-			mMuteMicButton.setChecked(LinphoneManager.getLc().isMicMuted());
-			LinphoneManager.addListener(this);
-			LinphoneManager.startProximitySensorForActivity(this);
-		}
-		super.onResume();
-	}
-
-	// Hook
-	protected boolean shouldFinishCalleeActivity() {
-		return mSpecificCalls.size() == 0;
-	}
-
-	@Override
-	protected void onPause() {
-		LinphoneManager.removeListener(this);
-		LinphoneManager.stopProximitySensorForActivity(this);
-		setActive(false);
-		if (isFinishing()) {
-			stopChronometers();
-		}
-		super.onPause();
-	}
-
-	@Override
-	public void onCallStateChanged(LinphoneCall c, State s, String m) {
-		mHandler.post(new Runnable() {
-			public void run() {
-				mSpecificCalls = updateSpecificCallsList();
-				if (shouldFinishCalleeActivity()) {
-					finish();
-				} else {
-					updateUI();
-				}
-			}
-		});
-	}
-
-	protected LinphoneCore lc() {
-		return LinphoneManager.getLc();
-	}
-
-	private void stopChronometers() {
-		for (Chronometer chrono : mChronometers) {
-			chrono.stop();
-		}
-		mChronometers.clear();
-	}
-
-	protected void updateUI() {
-		stopChronometers();
-		mListAdapter.notifyDataSetChanged();
-	}
-
-
-	protected void enableView(View root, int id, OnClickListener l, boolean enable) {
-		LinphoneUtils.enableView(root, id, l, enable);
-	}
-
-	protected String getCalleeDisplayOrUserName(LinphoneAddress address) {
-		if (!TextUtils.isEmpty(address.getDisplayName())) {
-			return address.getDisplayName();
-		} else {
-			return address.getUserName();
-		}
-	}
-	
-	protected void setCalleePicture(ImageView pictureView, LinphoneAddress address) {
-		// May be greatly sped up using a drawable cache
-		Uri uri = LinphoneUtils.findUriPictureOfContactAndSetDisplayName(address, getContentResolver());
-		LinphoneUtils.setImagePictureFromUri(AbstractCalleesActivity.this, pictureView, uri, R.drawable.unknown_person);
-	}
-
-	protected void setVisibility(View v, int id, boolean visible) {
-		LinphoneUtils.setVisibility(v, id, visible);
-	}
-	protected void setVisibility(View v, boolean visible) {
-		LinphoneUtils.setVisibility(v, visible);
-	}
-
-	protected abstract class CalleeListAdapter extends BaseAdapter {
-		protected final List<LinphoneCall> getSpecificCalls() {
-			return mSpecificCalls;
-		}
-		public int getCount() {
-			return mSpecificCalls.size();
-		}
-
-		public LinphoneCall getItem(int position) {
-			return mSpecificCalls.get(position);
-		}
-
-		public long getItemId(int position) {
-			return position;
-		}
-
-		protected final void registerCallDurationTimer(View v, LinphoneCall call) {
-			int callDuration = call.getDuration();
-			if (callDuration == 0 && call.getState() != State.StreamsRunning) return;
-			Chronometer timer = (Chronometer) v.findViewById(R.id.callee_duration);
-			if (timer == null) throw new IllegalArgumentException("no callee_duration view found");
-			timer.setBase(SystemClock.elapsedRealtime() - 1000 * callDuration);
-			timer.start();
-		}
-		
-		protected final void initCallQualityListener() {
-			final int timeToRefresh;
-			if (shouldDisplayWhoIsTalking)
-				timeToRefresh = 100;
-			else
-				timeToRefresh = 1000;
-			
-			callqualityHandler = new Handler();
-			viewsToUpdateCallQuality = new ArrayList<View>();
-			callqualityHandler.postDelayed(new Runnable() {
-				public void run() {
-					if (viewsToUpdateCallQuality == null) {
-						return;
-					}
-
-					for (View v : viewsToUpdateCallQuality) {
-						LinphoneCall call = (LinphoneCall) v.getTag();
-						float newQuality = call.getCurrentQuality();
-							updateQualityOfSignalIcon(v, newQuality);
-						
-						// We also use this handler to display the ones who speaks
-						ImageView speaking = (ImageView) v.findViewById(R.id.callee_status_speeking);
-						if (shouldDisplayWhoIsTalking && call.getPlayVolume() >= -20) {
-							speaking.setVisibility(View.VISIBLE);
-						} else if (speaking.getVisibility() != View.GONE) {
-							speaking.setVisibility(View.GONE);
-						}
-					}
-					
-					callqualityHandler.postDelayed(this, timeToRefresh);
-				}
-			},timeToRefresh);
-		}
-		
-		protected final void registerCallQualityListener(final View v, final LinphoneCall call) {
-			if (viewsToUpdateCallQuality == null && callqualityHandler == null) {
-				initCallQualityListener();
-			}
-			v.setTag(call);
-			viewsToUpdateCallQuality.add(v);
-		}
-		
-		protected final void registerCallSpeakerListener() {
-			shouldDisplayWhoIsTalking = true;
-		}
-	}
-
-	@Override
-	public void onClick(View v) {
-		int id = v.getId();
-		if (id == R.id.toggleMuteMic) {
-			lc().muteMic(((Checkable) v).isChecked());
-		}
-		else if (id == R.id.toggleSpeaker) {
-			if (((Checkable) v).isChecked()) {
-				LinphoneManager.getInstance().routeAudioToSpeaker();
-			} else {
-				LinphoneManager.getInstance().routeAudioToReceiver();
-			}
-		}
-	}
-
-	@Override
-	public void onAudioStateChanged(final AudioState state) {
-		mHandler.post(new Runnable() {
-			@Override
-			public void run() {
-				switch (state) {
-				case SPEAKER:
-					mSpeakerButton.setChecked(true);
-					break;
-				case EARPIECE:
-					mSpeakerButton.setChecked(false);
-					break;
-				default:
-					throw new RuntimeException("Unknown audio state " + state);
-				}
-			}
-		});
-	}
-	
-	void updateQualityOfSignalIcon(View v, float quality)
-	{
-		ImageView qos = (ImageView) v.findViewById(R.id.callee_status_qos);
-		if (!(qos.getVisibility() == View.VISIBLE)) {
-			qos.setVisibility(View.VISIBLE);
-		}
-		if (quality >= 4) // Good Quality
-		{
-			qos.setImageDrawable(getResources().getDrawable(R.drawable.stat_sys_signal_4));
-		}
-		else if (quality >= 3) // Average quality
-		{
-			qos.setImageDrawable(getResources().getDrawable(R.drawable.stat_sys_signal_3));
-		}
-		else if (quality >= 2) // Low quality
-		{
-			qos.setImageDrawable(getResources().getDrawable(R.drawable.stat_sys_signal_2));
-		}
-		else if (quality >= 1) // Very low quality
-		{
-			qos.setImageDrawable(getResources().getDrawable(R.drawable.stat_sys_signal_1));
-		}
-		else // Worst quality
-		{
-			qos.setImageDrawable(getResources().getDrawable(R.drawable.stat_sys_signal_0));
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/org/linphone/AbstractContactPickerActivityNew.java b/src/org/linphone/AbstractContactPickerActivityNew.java
deleted file mode 100644
index 87f6dcc5b..000000000
--- a/src/org/linphone/AbstractContactPickerActivityNew.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
-ContactPickerActivity.java
-Copyright (C) 2010  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 java.util.Collections;
-import java.util.List;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Bundle;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.EditText;
-import android.widget.FilterQueryProvider;
-import android.widget.ListView;
-import android.widget.SimpleCursorAdapter;
-import android.widget.TextView;
-import android.widget.Toast;
-import android.widget.AdapterView.OnItemClickListener;
-
-
-/**
- * Activity for retrieving a phone number / SIP address to call.
- * <br />
- *
- * The cinematic is:
- * <ul>
- * <li>Select contact (either through native or custom way)</li>
- * <li>Select phone number or SIP address
- * <li>Back to dialer</li>
- * </ul>
- * 
- * @author Guillaume Beraudo
- *
- */
-public abstract class AbstractContactPickerActivityNew extends Activity implements FilterQueryProvider {
-
-    private ListView mContactList;
-    protected EditText mcontactFilter;
-
-    private SimpleCursorAdapter adapter;
-    protected boolean useNativePicker;
-
-    protected final String col_display_name = "display_name";
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);    
-
-		useNativePicker = getResources().getBoolean(R.bool.use_android_contact_picker);
-
-		if (!useNativePicker) {
-			setContentView(R.layout.contact_picker);
-			createCustomPicker();
-		}
-
-		onNewIntent(getIntent());
-	}
-
-	
-
-	protected void createCustomPicker() {
-        mContactList = (ListView) findViewById(R.id.contactList);
-
-        mcontactFilter = (EditText) findViewById(R.id.contactFilter);
-        mcontactFilter.addTextChangedListener(new TextWatcher() {
-			public void onTextChanged(CharSequence s, int start, int b, int c) {}
-			public void beforeTextChanged(CharSequence s, int st, int c, int a) {}
-			
-			public void afterTextChanged(Editable s) {
-				adapter.runQueryOnBackgroundThread(s);
-				adapter.getFilter().filter(s.toString());
-			}
-		});
-
-
-        // Populate the contact list
-        String[] from = new String[] {col_display_name};
-        int[] to = new int[] {android.R.id.text1};
-        int layout = android.R.layout.simple_list_item_1;
-        adapter = new SimpleCursorAdapter(this, layout, runQuery(null), from, to);
-        adapter.setFilterQueryProvider(this);
-        mContactList.setAdapter(adapter);
-        
-        mContactList.setOnItemClickListener(new OnItemClickListener() {
-			public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-				final CharSequence contactName = ((TextView) view.findViewById(android.R.id.text1)).getText();
-				choosePhoneNumberAndDial(contactName, String.valueOf(id));
-			}
-        });
-	}
-
-
-
-	protected void choosePhoneNumberAndDial(final CharSequence contactName, final String id) {
-		List<String> phones = extractPhones(id);
-		phones.addAll(extractSipNumbers(id));
-		
-		switch (phones.size()) {
-		case 0:
-			String msg = String.format(getString(R.string.no_phone_numbers), contactName);
-			Toast.makeText(this, msg, Toast.LENGTH_LONG).show();
-			((ContactPicked) getParent()).goToDialer();
-			break;
-		case 1:
-			returnSelectedValues(phones.get(0), contactName.toString(), getPhotoUri(id));
-			break;
-		default:
-			AlertDialog.Builder builder = new AlertDialog.Builder(this);
-
-			final ArrayAdapter<String> pAdapter = new ArrayAdapter<String>(this,
-					android.R.layout.simple_dropdown_item_1line, phones);
-
-			builder.setTitle(String.format(getString(R.string.title_numbers_dialog),contactName));
-			builder.setAdapter(pAdapter, new DialogInterface.OnClickListener() {
-				public void onClick(DialogInterface dialog, int which) {
-					dialog.dismiss();
-					returnSelectedValues(pAdapter.getItem(which), contactName.toString(),getPhotoUri(id));
-				}
-			});
-			builder.setCancelable(true);
-			builder.setNeutralButton("cancel", new DialogInterface.OnClickListener() {
-				public void onClick(DialogInterface dialog, int which) {
-					dialog.dismiss();
-				}
-			});
-			builder.create().show();
-		}
-	}
-
-	private void returnSelectedValues(String number, String name, Uri photo) {
-/*		if (getCallingActivity() != null) {
-			setResult(RESULT_OK, new Intent()
-				.putExtra(Intent.EXTRA_PHONE_NUMBER, number)
-				.putExtra(EXTRA_CONTACT_NAME, name));
-			finish();
-		}*/
-
-		((ContactPicked) getParent()).setAddressAndGoToDialer(number, name, photo);
-	}
-
-	
-	protected abstract List<String> extractPhones(String id);
-	protected abstract Uri getPhotoUri(String id);
-
-	// Hook
-	protected List<String> extractSipNumbers(String id) {
-		return Collections.emptyList();
-	}
-
-	public abstract Cursor runQuery(CharSequence constraint);
-
-}
diff --git a/src/org/linphone/ConferenceDetailsActivity.java b/src/org/linphone/ConferenceDetailsActivity.java
deleted file mode 100644
index f9ebc4763..000000000
--- a/src/org/linphone/ConferenceDetailsActivity.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
-ConferenceActivity.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 java.util.List;
-
-import org.linphone.core.LinphoneAddress;
-import org.linphone.core.LinphoneCall;
-import org.linphone.mediastream.Version;
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.os.Bundle;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.View.OnClickListener;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-/**
- * List participants of a conference call.
- *
- * @author Guillaume Beraudo
- *
- */
-public class ConferenceDetailsActivity extends AbstractCalleesActivity  {
-
-	public static boolean active;
-	@Override protected void setActive(boolean a) {active = a;}
-	@Override protected boolean isActive() {return active;}
-	
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		if (finishIfAutoRestartAfterACrash(savedInstanceState)) {
-			return;
-		}
-		setContentView(R.layout.conference_details_layout);
-		View v=findViewById(R.id.incallHang);
-		v.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				lc().terminateConference();
-			}
-		});
-		super.onCreate(savedInstanceState);
-	}
-
-	protected CalleeListAdapter createCalleeListAdapter() {
-		return new ConfListAdapter();
-	}
-
-	private class ConfListAdapter extends CalleeListAdapter {
-		@Override
-		public View getView(int position, View v, ViewGroup parent) {
-			if (v == null) {
-				if (Version.sdkAboveOrEqual(Version.API06_ECLAIR_201)) {
-					v = getLayoutInflater().inflate(R.layout.conf_callee, null);
-				} else {
-					v = getLayoutInflater().inflate(R.layout.conf_callee_older_devices, null);
-				}
-			}
-
-			final LinphoneCall call = getItem(position);
-			LinphoneAddress address = call.getRemoteAddress();
-			final String mainText = getCalleeDisplayOrUserName(address);
-			((TextView) v.findViewById(R.id.name)).setText(mainText);
-			((TextView) v.findViewById(R.id.address)).setText("");
-
-			v.setOnClickListener(new OnClickListener() {
-				public void onClick(View v) {
-					if (lc().soundResourcesLocked()) {
-						return;
-					}
-					View content = getLayoutInflater().inflate(R.layout.conf_details_participant_choices_dialog, null);
-					Dialog dialog = new AlertDialog.Builder(ConferenceDetailsActivity.this).setView(content).create();
-					OnClickListener l = new CallActionListener(call, dialog);
-					enableView(content, R.id.remove_from_conference, l, true);
-					enableView(content, R.id.terminate_call, l, true);
-					dialog.show();
-				}
-			});
-			
-			setVisibility(v, R.id.callee_status_qos, true);
-
-			// May be greatly sped up using a drawable cache
-			ImageView pictureView = (ImageView) v.findViewById(R.id.picture);
-			setCalleePicture(pictureView, address);
-
-			registerCallDurationTimer(v, call);
-			registerCallQualityListener(v, call);
-			registerCallSpeakerListener();
-			
-			return v;
-		}
-
-	}
-
-	private class CallActionListener implements OnClickListener {
-		private LinphoneCall call;
-		private Dialog dialog;
-		public CallActionListener(LinphoneCall call, Dialog dialog) {
-			this.call = call;
-			this.dialog = dialog;
-		}
-		public void onClick(View v) {
-			int id = v.getId();
-			if (id == R.id.terminate_call) {
-				lc().terminateCall(call);
-			}
-			else if (id == R.id.remove_from_conference) {
-				lc().removeFromConference(call);
-				if (LinphoneUtils.countConferenceCalls(lc()) == 0) {
-					finish();
-				}
-			}
-			else {
-				throw new RuntimeException("unknown id " + v.getId());
-			}
-			if (dialog != null) dialog.dismiss();
-		}
-	}
-
-
-	@Override
-	protected List<LinphoneCall> updateSpecificCallsList() {
-		return LinphoneUtils.getLinphoneCallsInConf(lc());
-	}
-
-}
\ No newline at end of file
diff --git a/src/org/linphone/ContactHelper.java b/src/org/linphone/ContactHelper.java
index e47add169..f1b848c41 100644
--- a/src/org/linphone/ContactHelper.java
+++ b/src/org/linphone/ContactHelper.java
@@ -18,13 +18,24 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 package org.linphone;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.linphone.core.LinphoneAddress;
 import org.linphone.mediastream.Version;
+import org.linphone.ui.AddressText;
 
 import android.content.ContentResolver;
 import android.content.ContentUris;
+import android.content.ContentValues;
+import android.content.Intent;
 import android.database.Cursor;
 import android.net.Uri;
+import android.provider.ContactsContract;
+import android.provider.ContactsContract.CommonDataKinds.SipAddress;
+import android.provider.ContactsContract.Contacts;
+import android.provider.ContactsContract.Contacts.Data;
+import android.provider.ContactsContract.Intents.Insert;
 import android.telephony.PhoneNumberUtils;
 import android.text.TextUtils;
 
@@ -34,7 +45,6 @@ public final class ContactHelper {
 	private String domain;
 	private ContentResolver resolver;
 
-
 	private Uri foundPhotoUri;
 	public Uri getUri() {
 		return foundPhotoUri;
@@ -55,7 +65,7 @@ public final class ContactHelper {
 
 	public boolean query() {
 		boolean succeeded;
-		if (Version.sdkAboveOrEqual(Version.API06_ECLAIR_201)) {
+		if (Version.sdkAboveOrEqual(Version.API05_ECLAIR_20)) {
 			ContactHelperNew helper = new ContactHelperNew();
 			succeeded = helper.queryNewContactAPI();
 		} else {
@@ -67,7 +77,38 @@ public final class ContactHelper {
 		return succeeded;
 	}
 
-
+	public static Intent prepareAddContactIntent(AddressText address) {
+		return prepareAddContactIntent(address.getDisplayedName(), address.getText().toString());
+	}
+	
+	 //FIXME : Require API 5+
+	public static Intent prepareAddContactIntent(String displayName, String sipUri) {
+		Intent intent = new Intent(Intent.ACTION_INSERT, Contacts.CONTENT_URI);
+		intent.putExtra(ContactsContract.Intents.Insert.NAME, displayName);
+		
+		if (Version.sdkAboveOrEqual(Version.API09_GINGERBREAD_23)) {
+			ArrayList<ContentValues> data = new ArrayList<ContentValues>();
+			ContentValues sipAddressRow = new ContentValues();
+			sipAddressRow.put(Data.MIMETYPE, SipAddress.CONTENT_ITEM_TYPE);
+			sipAddressRow.put(SipAddress.SIP_ADDRESS, sipUri);
+			data.add(sipAddressRow);
+			intent.putParcelableArrayListExtra(Insert.DATA, data);
+		} else {
+			// VoIP field not available, we store the address in the IM field
+			intent.putExtra(ContactsContract.Intents.Insert.IM_HANDLE, sipUri);
+			intent.putExtra(ContactsContract.Intents.Insert.IM_PROTOCOL, "sip");
+		}
+		  
+		return intent;
+	}
+	
+	public static Intent prepareEditContactIntent(int id) {
+		Intent intent = new Intent(Intent.ACTION_EDIT, Contacts.CONTENT_URI);
+		Uri contactUri = ContentUris.withAppendedId(Contacts.CONTENT_URI, id);
+		intent.setData(contactUri);
+		
+		return intent;
+	}
 
 	public static boolean testPhotoUri(Cursor c) {
 		if (c == null) return false;
@@ -96,7 +137,6 @@ public final class ContactHelper {
     	return testPhotoUriAndCloseCursor(cursor);
     }
 
-
 	// OLD API
 	@SuppressWarnings("deprecation")
 	private final boolean queryOldContactAPI() {
@@ -128,22 +168,10 @@ public final class ContactHelper {
 
 	// END OLD API
 	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
 	// START NEW CONTACT API
 
 	private class ContactHelperNew {
-		
-		
-		
+
 		private final boolean checkPhotosUris(ContentResolver resolver, Cursor c, String idCol, String nameCol) {
 			if (c == null) return false;
 			while (c.moveToNext()) {
@@ -175,6 +203,24 @@ public final class ContactHelper {
 			String[] projection = {
 					android.provider.ContactsContract.Data.CONTACT_ID,
 					android.provider.ContactsContract.CommonDataKinds.Phone.DISPLAY_NAME};
+
+			// Then using custom SIP field
+			if (Version.sdkAboveOrEqual(Version.API09_GINGERBREAD_23)) {
+				String selection = new StringBuilder()
+					.append(android.provider.ContactsContract.CommonDataKinds.SipAddress.SIP_ADDRESS)
+					.append(" = ? AND ")
+					.append(android.provider.ContactsContract.Data.MIMETYPE)
+					.append(" = '")
+					.append(android.provider.ContactsContract.CommonDataKinds.SipAddress.CONTENT_ITEM_TYPE)
+					.append("'")
+					.toString();
+				Cursor c = resolver.query(uri, projection, selection, new String[] {sipUri}, null);
+				boolean valid = checkPhotosUris(resolver, c,
+						android.provider.ContactsContract.Data.CONTACT_ID,
+						android.provider.ContactsContract.CommonDataKinds.Phone.DISPLAY_NAME);
+				if (valid) return true;
+			}
+			
 			String selection = new StringBuilder()
 				.append(android.provider.ContactsContract.CommonDataKinds.Im.DATA).append(" =  ? AND ")
 				.append(android.provider.ContactsContract.Data.MIMETYPE)
@@ -189,24 +235,6 @@ public final class ContactHelper {
 					android.provider.ContactsContract.CommonDataKinds.Phone.DISPLAY_NAME);
 			if (valid) return true;
 
-
-			// Then using custom SIP field
-			if (Version.sdkAboveOrEqual(Version.API09_GINGERBREAD_23)) {
-				selection = new StringBuilder()
-					.append(android.provider.ContactsContract.CommonDataKinds.SipAddress.SIP_ADDRESS)
-					.append(" = ? AND ")
-					.append(android.provider.ContactsContract.Data.MIMETYPE)
-					.append(" = '")
-					.append(android.provider.ContactsContract.CommonDataKinds.SipAddress.CONTENT_ITEM_TYPE)
-					.append("'")
-					.toString();
-				c = resolver.query(uri, projection, selection, new String[] {sipUri}, null);
-				valid = checkPhotosUris(resolver, c,
-						android.provider.ContactsContract.Data.CONTACT_ID,
-						android.provider.ContactsContract.CommonDataKinds.Phone.DISPLAY_NAME);
-				if (valid) return true;
-			}
-
 			// Finally using phone number
 			String normalizedNumber = PhoneNumberUtils.getStrippedReversed(username);
 			if (TextUtils.isEmpty(normalizedNumber)) {
@@ -244,14 +272,49 @@ public final class ContactHelper {
 			c.close();
 			return false;
 		}
-
-
 	}
 	
-	
-	
-	
-	
-	
-	
-}
+	public static List<String> extractContactNumbersAndAddresses(String id, ContentResolver cr) {
+		List<String> list = new ArrayList<String>();
+
+		Uri uri = ContactsContract.Data.CONTENT_URI;
+		String[] projection = {ContactsContract.CommonDataKinds.Im.DATA};
+
+		if (Version.sdkAboveOrEqual(Version.API09_GINGERBREAD_23)) {
+			String selection = new StringBuilder()
+				.append(ContactsContract.Data.CONTACT_ID)
+				.append(" = ? AND ")
+				.append(ContactsContract.Data.MIMETYPE)
+				.append(" = '")
+				.append(ContactsContract.CommonDataKinds.SipAddress.CONTENT_ITEM_TYPE)
+				.append("'")
+				.toString();
+			projection = new String[] {ContactsContract.CommonDataKinds.SipAddress.SIP_ADDRESS};
+			Cursor c = cr.query(uri, projection, selection, new String[]{id}, null);
+
+			int nbId = c.getColumnIndex(ContactsContract.CommonDataKinds.SipAddress.SIP_ADDRESS);
+			while (c.moveToNext()) {
+				list.add("sip:" + c.getString(nbId)); 
+			}
+			c.close();
+		} else {
+			String selection = new StringBuilder()
+				.append(ContactsContract.Data.CONTACT_ID).append(" =  ? AND ")
+				.append(ContactsContract.Data.MIMETYPE).append(" = '")
+				.append(ContactsContract.CommonDataKinds.Im.CONTENT_ITEM_TYPE)
+				.append("' AND lower(")
+				.append(ContactsContract.CommonDataKinds.Im.CUSTOM_PROTOCOL)
+				.append(") = 'sip'")
+				.toString();
+			Cursor c = cr.query(uri, projection, selection, new String[]{id}, null);
+
+			int nbId = c.getColumnIndex(ContactsContract.CommonDataKinds.Im.DATA);
+			while (c.moveToNext()) {
+				list.add("sip:" + c.getString(nbId)); 
+			}
+			c.close();
+		}
+
+		return list;
+	}
+}
\ No newline at end of file
diff --git a/src/org/linphone/ContactPickerActivityNew.java b/src/org/linphone/ContactPickerActivityNew.java
deleted file mode 100644
index 89132ab10..000000000
--- a/src/org/linphone/ContactPickerActivityNew.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
-ContactPickerActivity.java
-Copyright (C) 2010  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 java.util.ArrayList;
-import java.util.List;
-
-import org.linphone.mediastream.Version;
-
-import android.content.ContentResolver;
-import android.content.ContentUris;
-import android.content.Intent;
-import android.database.Cursor;
-import android.net.Uri;
-import android.provider.ContactsContract;
-import android.provider.ContactsContract.Contacts;
-import android.text.TextUtils;
-
-
-/**
- * Activity for retrieving a phone number / SIP address to call.
- * <br />
- *
- * The cinematic is:
- * <ul>
- * <li>Select contact (either through native or custom way)</li>
- * <li>Select phone number or SIP address
- * <li>Back to dialer</li>
- * </ul>
- * 
- * @author Guillaume Beraudo
- *
- */
-public class ContactPickerActivityNew extends AbstractContactPickerActivityNew {
-
-
-
-	@Override
-	public Uri getPhotoUri(String id) {
-		return retrievePhotoUriAndSetDisplayName(getContentResolver(), Long.parseLong(id));
-	}
-
-	private static Uri retrievePhotoUriAndSetDisplayName(ContentResolver resolver, long id) {
-		Uri contactUri = ContentUris.withAppendedId(Contacts.CONTENT_URI, id);
-		Uri photoUri = Uri.withAppendedPath(contactUri, Contacts.Photo.CONTENT_DIRECTORY);
-		if (photoUri == null) {
-			return null;
-		}
-		if (ContactHelper.testPhotoUri(resolver, photoUri, ContactsContract.CommonDataKinds.Photo.PHOTO)) {
-			return photoUri;
-		}
-		return null;
-	}
-
-	protected List<String> extractPhones(String id) {
-		List<String> list = new ArrayList<String>();
-		Uri uri = ContactsContract.CommonDataKinds.Phone.CONTENT_URI;
-		String[] projection = {ContactsContract.CommonDataKinds.Phone.NUMBER};
-		String selection = ContactsContract.CommonDataKinds.Phone.CONTACT_ID + " = ?";
-		String[] selArgs = new String[] {id};
-		Cursor c = this.getContentResolver().query(uri, projection, selection, selArgs, null);
-
-		int nbId = c.getColumnIndex(ContactsContract.CommonDataKinds.Phone.NUMBER);
-
-		while (c.moveToNext()) {
-			list.add(c.getString(nbId)); 
-		}
-
-		c.close();
-
-		return list;
-	}
-
-	protected List<String> extractSipNumbers(String id) {
-		List<String> list = new ArrayList<String>();
-		Uri uri = ContactsContract.Data.CONTENT_URI;
-		String[] projection = {ContactsContract.CommonDataKinds.Im.DATA};
-		String selection = new StringBuilder()
-			.append(ContactsContract.Data.CONTACT_ID).append(" =  ? AND ")
-			.append(ContactsContract.Data.MIMETYPE).append(" = '")
-			.append(ContactsContract.CommonDataKinds.Im.CONTENT_ITEM_TYPE)
-			.append("' AND lower(")
-			.append(ContactsContract.CommonDataKinds.Im.CUSTOM_PROTOCOL)
-			.append(") = 'sip'")
-			.toString();
-		Cursor c = getContentResolver().query(uri, projection, selection, new String[]{id}, null);
-
-		int nbId = c.getColumnIndex(ContactsContract.CommonDataKinds.Im.DATA);
-		while (c.moveToNext()) {
-			list.add("sip:" + c.getString(nbId)); 
-		}
-		c.close();
-		
-
-		// Using the SIP contact field added in SDK 9
-		if (Version.sdkAboveOrEqual(Version.API09_GINGERBREAD_23)) {
-			selection = new StringBuilder()
-				.append(ContactsContract.Data.CONTACT_ID)
-				.append(" = ? AND ")
-				.append(ContactsContract.Data.MIMETYPE)
-				.append(" = '")
-				.append(ContactsContract.CommonDataKinds.SipAddress.CONTENT_ITEM_TYPE)
-				.append("'")
-				.toString();
-			projection = new String[] {ContactsContract.CommonDataKinds.SipAddress.SIP_ADDRESS};
-			c = this.getContentResolver().query(uri, projection, selection, new String[]{id}, null);
-
-			nbId = c.getColumnIndex(ContactsContract.CommonDataKinds.SipAddress.SIP_ADDRESS);
-			while (c.moveToNext()) {
-				list.add("sip:" + c.getString(nbId)); 
-			}
-			c.close();
-		}
-
-		return list;
-	}
-
-
-	@Override
-	protected void onNewIntent(Intent intent) {
-		// Launch the native contact picker here in spite of onResume
-		// in order to avoid a loop that sometime occurs on HTC phones.
-		if (useNativePicker) {
-			Uri uri = ContactsContract.Contacts.CONTENT_URI;
-			//ContactsContract.CommonDataKinds.Phone.CONTENT_URI
-			startActivityForResult(new Intent(Intent.ACTION_PICK, uri),	0);
-		}
-		super.onNewIntent(intent);
-	}
-
-	protected void onActivityResult(int reqCode, int resultCode, Intent intent) {
-		// If using native picker
-		if (reqCode == 0) {
-			if (resultCode == RESULT_OK) {
-				String id = intent.getData().getLastPathSegment();
-				String contactName = intent.getStringExtra(Intent.EXTRA_SHORTCUT_NAME);
-				if (contactName == null) {
-					contactName = retrieveContactName(id);
-				}
-				choosePhoneNumberAndDial(contactName, id);
-			}
-		}
-
-		((ContactPicked) getParent()).goToDialer();
-	}
-
-
-	private String retrieveContactName(String id) {
-		//Uri uri = ContactsContract.CommonDataKinds.Phone.CONTENT_URI;
-		Uri uri = ContactsContract.Contacts.CONTENT_URI;
-		String[] projection = new String[] {ContactsContract.Contacts.DISPLAY_NAME};
-		String selection = ContactsContract.Contacts._ID + " = ?";
-		String[] selArgs = new String[] {id};
-		Cursor c = this.getContentResolver().query(uri,	projection, selection, selArgs, null);
-
-		String name = "";
-		if (c.moveToFirst()) {
-			name = c.getString(c.getColumnIndex(ContactsContract.Contacts.DISPLAY_NAME)); 
-		}
-		c.close();
-
-		return name;
-	}
-
-
-
-	public Cursor runQuery(CharSequence constraint) {
-		// Run query
-		Uri uri = ContactsContract.Contacts.CONTENT_URI;
-		String[] projection = new String[] {
-				ContactsContract.Contacts._ID,
-				ContactsContract.Contacts.DISPLAY_NAME
-		};
-		String selection =
-			ContactsContract.Contacts.IN_VISIBLE_GROUP + " = '1' and "
-			+ ContactsContract.Contacts.HAS_PHONE_NUMBER + " = '1'";
-		String[] selectionArgs = null;
-		if (!TextUtils.isEmpty(constraint)) {
-			// FIXME SQL injection - Android doesn't accept '?' in like queries 
-			selection += " and " + ContactsContract.Contacts.DISPLAY_NAME + " like '%"+mcontactFilter.getText()+"%'";
-		}
-
-		String sortOrder = ContactsContract.Contacts.DISPLAY_NAME + " COLLATE LOCALIZED ASC";
-
-		return managedQuery(uri, projection, selection, selectionArgs, sortOrder);
-	}
-
-
-}
diff --git a/src/org/linphone/ContactPickerActivityOld.java b/src/org/linphone/ContactPickerActivityOld.java
deleted file mode 100644
index b136aea2c..000000000
--- a/src/org/linphone/ContactPickerActivityOld.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-ContactPickerActivity.java
-Copyright (C) 2010  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.app.Activity;
-import android.content.ContentUris;
-import android.content.Intent;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Bundle;
-import android.provider.Contacts;
-import android.provider.Contacts.People;
-
-@SuppressWarnings("deprecation")
-public class ContactPickerActivityOld extends Activity {
-    static final int PICK_CONTACT_REQUEST = 0;
-    static final int PICK_PHONE_NUMBER_REQUEST = 1;
-
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);    
-		onNewIntent(getIntent());
-    }
-
-
-	@Override
-	protected void onNewIntent(Intent intent) {
-		// Launch the native contact picker here in spite of onResume
-		// in order to avoid a loop that sometime occurs on HTC phones.
-		Uri uri =  Contacts.Phones.CONTENT_URI;
-		startActivityForResult(new Intent(Intent.ACTION_PICK,uri), PICK_CONTACT_REQUEST);
-		super.onNewIntent(intent);
-	}
-
-	protected void onActivityResult(int requestCode, int resultCode,
-            Intent data) {
-        if (requestCode == PICK_CONTACT_REQUEST) {
-            if (resultCode == RESULT_OK) {
-            	String lColumns[] = new String[] { People._ID, People.NAME, People.NUMBER };
- 
-                Cursor lCur = managedQuery(data.getData(), lColumns, // Which columns to return
-                        null, // WHERE clause; which rows to return(all rows)
-                        null, // WHERE clause selection arguments (none)
-                        null // Order-by clause (ascending by name)
-
-                );
-                if (lCur.moveToFirst()) {
-                    String lName = lCur.getString(lCur.getColumnIndex(People.NAME));
-                    String lPhoneNo = lCur.getString(lCur.getColumnIndex(People.NUMBER));
-                    long id = lCur.getLong(lCur.getColumnIndex(People._ID));
-                    Uri personUri = ContentUris.withAppendedId(People.CONTENT_URI, id);
-                    Uri pictureUri = Uri.withAppendedPath(personUri, Contacts.Photos.CONTENT_DIRECTORY);
-                    if (!ContactHelper.testPhotoUri(getContentResolver(), pictureUri, android.provider.Contacts.Photos.DATA)) {
-                    	pictureUri = null;
-                    }
-                    ((ContactPicked) getParent()).setAddressAndGoToDialer(lPhoneNo, lName, pictureUri);
-                }
-            }
-            	
-            ((ContactPicked) getParent()).goToDialer();
-            }
-        }
-
-}
diff --git a/src/org/linphone/DialerActivity.java b/src/org/linphone/DialerActivity.java
deleted file mode 100644
index bade61e03..000000000
--- a/src/org/linphone/DialerActivity.java
+++ /dev/null
@@ -1,577 +0,0 @@
-/*
-DialerActivity.java
-Copyright (C) 2010  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 java.util.ArrayList;
-import java.util.HashMap;
-
-import org.linphone.LinphoneService.LinphoneGuiListener;
-import org.linphone.core.LinphoneCall;
-import org.linphone.core.LinphoneCall.State;
-import org.linphone.core.LinphoneCore.RegistrationState;
-import org.linphone.core.LinphoneCoreException;
-import org.linphone.core.LinphoneProxyConfig;
-import org.linphone.core.Log;
-import org.linphone.mediastream.Version;
-import org.linphone.mediastream.video.capture.hwconf.AndroidCameraConfiguration;
-import org.linphone.ui.AddressAware;
-import org.linphone.ui.AddressText;
-import org.linphone.ui.CallButton;
-import org.linphone.ui.CameraView;
-import org.linphone.ui.EraseButton;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.pm.ActivityInfo;
-import android.hardware.Camera;
-import android.hardware.Camera.CameraInfo;
-import android.net.Uri;
-import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.view.KeyEvent;
-import android.view.LayoutInflater;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.View.OnTouchListener;
-import android.view.WindowManager;
-import android.view.View.OnClickListener;
-import android.widget.Adapter;
-import android.widget.Button;
-import android.widget.LinearLayout;
-import android.widget.ListAdapter;
-import android.widget.ListView;
-import android.widget.SimpleAdapter;
-import android.widget.SlidingDrawer;
-import android.widget.SlidingDrawer.OnDrawerScrollListener;
-import android.widget.TextView;
-import android.widget.Toast;
-
-/**
- * 
- * Dialer and main activity of Linphone Android.
- * 
- * Roles are:<ul>
- * <li>Display the numpad, call/accept, address buttons</li>
- * <li>Define preferences through the menu</li>
- * <li>React to bad preference / no account set</li>
- * <li>Manage first launch</li>
- * </ul>
- *
- */
-public class DialerActivity extends Activity implements LinphoneGuiListener {
-	
-	private TextView mStatus;
-
-	private AddressText mAddress;
-	private CallButton mCall;
-	private Button mBack, mAddCall, mSwitchCamera;
-	private LinearLayout mInCallControls;
-
-	private static DialerActivity instance;
-	public boolean mVisible;
-	private boolean mPreventDoubleCallOnRotation;
-
-	private AlertDialog wizardDialog;
-	protected String username;
-	private String key;
-
-	private CameraView mVideoCaptureView;
-	private int mCurrentCameraId = 0;
-
-	private Camera mCamera;
-
-	
-	private static final String CURRENT_ADDRESS = "org.linphone.current-address"; 
-	private static final String CURRENT_DISPLAYNAME = "org.linphone.current-displayname";
-	private static final String PREVENT_DOUBLE_CALL = "prevent_call_on_phone_rotation";
-	
-	private static final int CONFIRM_ID = 0x668;
-
-	/**
-	 * @return null if not ready yet
-	 */
-	public static DialerActivity instance() { 
-		return instance;
-	}
-	
-	private String getStatusIcon(RegistrationState state) {
-		if (state == RegistrationState.RegistrationOk)
-			return Integer.toString(R.drawable.status_green);
-		
-		else if (state == RegistrationState.RegistrationNone)
-			return Integer.toString(R.drawable.status_red);
-		
-		else if (state == RegistrationState.RegistrationProgress)
-			return Integer.toString(R.drawable.status_orange);
-		
-		else 
-			return Integer.toString(R.drawable.status_offline);
-	}
-	
-	private void displayRegisterStatus() {
-		ListView accounts = (ListView) findViewById(R.id.accounts);
-		if (accounts != null) {
-			accounts.setDividerHeight(0);
-			ArrayList<HashMap<String,String>> hashMapAccountsStateList = new ArrayList<HashMap<String,String>>();
-			for (LinphoneProxyConfig lpc : LinphoneManager.getLc().getProxyConfigList()) {
-				HashMap<String, String> entitiesHashMap = new HashMap<String, String>();
-				entitiesHashMap.put("Identity", lpc.getIdentity().split("sip:")[1]);
-				entitiesHashMap.put("State", getStatusIcon(lpc.getState()));
-				hashMapAccountsStateList.add(entitiesHashMap);
-			}
-			Adapter adapterForList = new SimpleAdapter(this, hashMapAccountsStateList, R.layout.accounts,
-	                new String[] {"Identity", "State"},
-	                new int[] { R.id.Identity, R.id.State });
-			accounts.setAdapter((ListAdapter) adapterForList);
-			accounts.invalidate();
-		}
-	}
-	
-	protected Dialog onCreateDialog (int id) {
-		if (id == CONFIRM_ID) {
-			AlertDialog.Builder builder = new AlertDialog.Builder(this);
-			builder.setTitle(R.string.wizard_confirmation);
-			
-			final LayoutInflater inflater = LayoutInflater.from(this);
-	    	View v = inflater.inflate(R.layout.wizard_confirm, null);
-	    	builder.setView(v);
-	    	
-	    	Button check = (Button) v.findViewById(R.id.wizardCheckAccount);
-	    	check.setOnClickListener(new OnClickListener() {
-				public void onClick(View v) {
-					wizardDialog.dismiss();
-					if (LinphonePreferencesActivity.isAccountVerified(username)) {
-						SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(DialerActivity.this);
-						SharedPreferences.Editor editor = prefs.edit();
-						editor.putBoolean(getString(R.string.pref_activated_key) + key, true);
-						editor.commit();
-					} else {
-						showDialog(CONFIRM_ID);
-					}
-				}
-			});
-	    	
-	    	Button cancel = (Button) v.findViewById(R.id.wizardCancel);
-	    	cancel.setOnClickListener(new OnClickListener() {
-				public void onClick(View v) {
-					wizardDialog.dismiss();
-				}
-			});
-	    	
-			wizardDialog = builder.create();
-			return wizardDialog;
-		}
-		return null;
-	}
-	
-	private void verifiyAccountsActivated() {
-		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
-		int nbAccounts = prefs.getInt(getString(R.string.pref_extra_accounts), 0);
-		
-		for (int i = 0; i < nbAccounts; i++) {
-			String key = (i == 0 ? "" : Integer.toString(i));
-			boolean createdByWizard = prefs.getBoolean(getString(R.string.pref_wizard_key) + key, false);
-			boolean activated = prefs.getBoolean(getString(R.string.pref_activated_key) + key, true);
-			if (createdByWizard && !activated) {
-				//Check if account has been activated since
-				String username = prefs.getString(getString(R.string.pref_username_key) + key, "");
-				activated = LinphonePreferencesActivity.isAccountVerified(username);
-				if (activated) {
-					SharedPreferences.Editor editor = prefs.edit();
-					editor.putBoolean(getString(R.string.pref_activated_key) + key, true);
-					editor.commit();
-				} else {
-					this.username = username;
-					this.key = key;
-					showDialog(CONFIRM_ID);
-				}
-			}
-		}
-	}
-
-	public void onCreate(Bundle savedInstanceState) {
-		if (Version.isXLargeScreen(this)) {
-			this.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
-		}
-		setContentView(R.layout.dialer);
-
-		mAddress = (AddressText) findViewById(R.id.SipUri); 
-		EraseButton erase = (EraseButton) findViewById(R.id.Erase);
-		erase.setAddressWidget(mAddress);
-		erase.requestFocus();
-
-		mCall = (CallButton) findViewById(R.id.Call);
-		mCall.setAddressWidget(mAddress);
-		mBack = (Button) findViewById(R.id.Back);
-		mAddCall = (Button) findViewById(R.id.AddCall);
-		mInCallControls = (LinearLayout) findViewById(R.id.InCallControls);
-		mStatus =  (TextView) findViewById(R.id.status_label);
-        
-		if (mBack != null) {
-			mBack.setOnClickListener(new OnClickListener() {
-				public void onClick(View v) {
-					LinphoneCall call = LinphoneManager.getLc().getCurrentCall();
-					if (call != null && call.getCurrentParamsCopy().getVideoEnabled())
-						LinphoneActivity.instance().startVideoActivity(call, 0);
-					else
-						LinphoneActivity.instance().startIncallActivity();
-				}
-			});
-		}
-		
-		if (mAddCall != null) {
-			mAddCall.setOnClickListener(new OnClickListener() {
-				public void onClick(View v) {
-					LinphoneCall call = LinphoneManager.getLc().getCurrentCall();
-					if (call != null && !call.isInConference()) {
-						LinphoneManager.getLc().pauseCall(call);
-					} else {
-						LinphoneManager.getLc().leaveConference();
-					}
-						
-					try {
-						LinphoneManager.getLc().invite(mAddress.getText().toString());
-					} catch (LinphoneCoreException e) {
-						Log.e(e);
-						Toast.makeText(DialerActivity.this, R.string.error_adding_new_call, Toast.LENGTH_LONG).show();
-					}
-				}
-			});
-		}
-		
-		if (Version.isXLargeScreen(this)) {
-			tryToInitTabletUI();
-		}
-		
-		SlidingDrawer drawer = (SlidingDrawer) findViewById(R.id.drawer);
-		if (drawer != null) {
-			boolean disable_sliding_drawer = getResources().getBoolean(R.bool.disable_dialer_sliding_drawer);
-			
-			if (disable_sliding_drawer) {
-				drawer.close();
-				drawer.lock();
-			} else {
-				drawer.setOnDrawerScrollListener(new OnDrawerScrollListener() {
-					public void onScrollEnded() {
-						
-					}
-		
-					public void onScrollStarted() {
-						displayRegisterStatus();
-					}
-				});
-			}
-		}
-
-		AddressAware numpad = (AddressAware) findViewById(R.id.Dialer);
-		if (numpad != null)
-			numpad.setAddressWidget(mAddress);
-
-		// call to super must be done after all fields are initialized
-		// because it may call this.enterIncallMode
-		super.onCreate(savedInstanceState);
-
-		mPreventDoubleCallOnRotation=savedInstanceState != null
-				&& savedInstanceState.getBoolean(PREVENT_DOUBLE_CALL, false);
-		if (mPreventDoubleCallOnRotation) {
-			Log.i("Prevent launching a new call on rotation");
-		} else {
-			checkIfOutgoingCallIntentReceived();
-		}
-
-		instance = this;
-		super.onCreate(savedInstanceState);
-		
-		verifiyAccountsActivated();
-		
-		displayRegisterStatus();
-		mCall.requestFocus();
-	}
-
-
-    private synchronized void tryToInitTabletUI() {
-		final int numberOfCameras = Camera.getNumberOfCameras();
-		
-        CameraInfo cameraInfo = new CameraInfo();
-        for (int i = 0; i < numberOfCameras; i++) {
-            Camera.getCameraInfo(i, cameraInfo);
-            if (cameraInfo.facing == CameraInfo.CAMERA_FACING_BACK) {
-                mCurrentCameraId = i;
-            }
-        }
-    	
-    	mVideoCaptureView = (CameraView) findViewById(R.id.video_background);
-		if (mVideoCaptureView != null)
-		{
-			if (mCamera == null) {
-				mCamera = Camera.open(mCurrentCameraId);
-			}
-			mVideoCaptureView.setCamera(mCamera, mCurrentCameraId);
-			mCamera.startPreview();
-		}
-		
-		mSwitchCamera = (Button) findViewById(R.id.switch_camera);
-		if (mSwitchCamera != null)
-		{
-			if (AndroidCameraConfiguration.hasSeveralCameras())
-				mSwitchCamera.setVisibility(View.VISIBLE);
-			
-			mSwitchCamera.setOnClickListener(new OnClickListener() {
-				public void onClick(View v) {
-					mCurrentCameraId = (mCurrentCameraId + 1) % numberOfCameras;
-					mCamera.release();
-					mVideoCaptureView.setCamera(null, -1);
-					
-					mCamera = Camera.open(mCurrentCameraId);
-					mVideoCaptureView.switchCamera(mCamera, mCurrentCameraId);
-					mCamera.startPreview();
-				}
-			});
-		}
-	}
-
-	private void checkIfOutgoingCallIntentReceived() {
-    	if (getIntent().getData() == null) return;
-
-    	if (!LinphoneService.isReady() || LinphoneManager.getLc().isIncall()) {
-    		Log.w("Outgoing call aborted as LinphoneService"
-    				+ " is not ready or we are already in call");
-    		return;
-    	}
-    	
-    	// Fix call from contact issue
-    	if (getIntent().getData().getSchemeSpecificPart() != null)
-    		getIntent().setAction(Intent.ACTION_CALL);
-    	
-    	newOutgoingCall(getIntent());
-	}
-
-
-
-    @Override
-    protected void onPause() {
-    	super.onPause();
-    	mVisible = false;
-
-    	if (mCamera != null) {
-            mCamera.release();
-			mVideoCaptureView.setCamera(null, -1);
-            mCamera = null;
-        }
-    }
-
-
-	
-
-	
-
-
-	@Override
-	public void onSaveInstanceState(Bundle savedInstanceState) {
-		super.onSaveInstanceState(savedInstanceState);
-		savedInstanceState.putCharSequence(CURRENT_ADDRESS, mAddress.getText());
-		if (mAddress.getDisplayedName() != null)
-			savedInstanceState.putString(CURRENT_DISPLAYNAME,mAddress.getDisplayedName());
-		savedInstanceState.putBoolean(PREVENT_DOUBLE_CALL, mPreventDoubleCallOnRotation);
-	}
-	
-	@Override
-	protected void onRestoreInstanceState(Bundle savedState) {
-		super.onRestoreInstanceState(savedState);
-		CharSequence addr = savedState.getCharSequence(CURRENT_ADDRESS);
-		if (addr != null && mAddress != null) {
-			mAddress.setText(addr); 
-		}
-		mAddress.setDisplayedName(savedState.getString(CURRENT_DISPLAYNAME));
-	}
-
-
-	@Override
-	protected void onDestroy() {
-		super.onDestroy();
-		instance=null;
-	}
-
-
-
-
-
-	public void newOutgoingCall(Intent intent) {
-		String scheme = intent.getData().getScheme();
-		if (scheme.startsWith("imto")) {
-			mAddress.setText("sip:" + intent.getData().getLastPathSegment());
-		} else if (scheme.startsWith("call") || scheme.startsWith("sip")) {
-			mAddress.setText(intent.getData().getSchemeSpecificPart());
-		} else {
-			Log.e("Unknown scheme: ",scheme);
-			mAddress.setText(intent.getData().getSchemeSpecificPart());
-		}
-
-		mAddress.clearDisplayedName();
-		intent.setData(null);
-		// Setting data to null is no use when the activity is recreated
-		// as the intent is immutable.
-		// https://groups.google.com/forum/#!topic/android-developers/vrLdM5mKeoY
-		mPreventDoubleCallOnRotation=true;
-		setIntent(intent);
-
-		LinphoneManager.getInstance().newOutgoingCall(mAddress);
-	}
-
-	
-	public void setContactAddress(String aContact,String aDisplayName, Uri photo) {
-		mAddress.setText(aContact);
-		mAddress.setDisplayedName(aDisplayName);
-		mAddress.setPictureUri(photo);
-	}
-
-	
-
-
-	
-	
-	/***** GUI delegates for listener LinphoneServiceListener *************/
-	@Override
-	public void onDisplayStatus(String message) {
-		mStatus.setText(message);
-	}
-
-	@Override
-	public void onAlreadyInCall() {
-		showToast(R.string.warning_already_incall);
-	}
-
-	@Override
-	public void onCannotGetCallParameters() { 
-		showToast(R.string.error_cannot_get_call_parameters,mAddress.getText());
-	}
-
-	@Override
-	public void onWrongDestinationAddress() {
-		showToast(R.string.warning_wrong_destination_address, mAddress.getText());
-	}
-
-	private void showToast(int id, String txt) {
-		final String msg = String.format(getString(id), txt);
-		Toast.makeText(this, msg, Toast.LENGTH_LONG).show();
-	}
-	private void showToast(int id, CharSequence txt) {
-		showToast(id, txt.toString());
-	}
-	private void showToast(int id) {
-		Toast.makeText(this, getString(id), Toast.LENGTH_LONG).show();
-	}
-
-	@Override
-	public void onCallStateChanged(LinphoneCall call, State s, String m) {
-		if (mVideoCaptureView != null && mCamera == null && !LinphoneManager.getLc().isIncall())
-		{
-			if (mInCallControls != null)
-				mInCallControls.setVisibility(View.GONE);
-			mCall.setVisibility(View.VISIBLE);
-			
-			if (AndroidCameraConfiguration.hasSeveralCameras() && mSwitchCamera != null)
-				mSwitchCamera.setVisibility(View.VISIBLE);
-			
-			mCamera = Camera.open(mCurrentCameraId);
-			mVideoCaptureView.switchCamera(mCamera, mCurrentCameraId);
-			mCamera.startPreview();
-		}
-	}
-	
-	public void onGlobalStateChangedToOn(String message) {
-		mCall.setEnabled(!LinphoneManager.getLc().isIncall());
-
-		if (getIntent().getData() != null) {
-			checkIfOutgoingCallIntentReceived();
-		}
-	}
-
-	@Override
-	protected void onResume() {
-		// When coming back from a video call, if the phone orientation is different
-		// Android will destroy the previous Dialer and create a new one.
-		// Unfortunately the "call end" status event is received in the meanwhile
-		// and set to the to be destroyed Dialer.
-		// Note1: We wait as long as possible before setting the last message.
-		// Note2: Linphone service is in charge of instantiating LinphoneManager
-		mVisible = true;
-		mStatus.setText(LinphoneManager.getInstance().getLastLcStatusMessage());
-        
-		super.onResume();
-		
-		if (mInCallControls != null)
-			mInCallControls.setVisibility(View.GONE);
-		mCall.setVisibility(View.VISIBLE);
-		
-		if (AndroidCameraConfiguration.hasSeveralCameras() && mSwitchCamera != null)
-			mSwitchCamera.setVisibility(View.VISIBLE);
-		
-		boolean callEstablished = isCallEstablished();
-		boolean isInCall = LinphoneManager.getLc().getCallsNb() > 1 || (LinphoneManager.getLc().getCallsNb() == 1 && callEstablished);
-		
-		if (mVideoCaptureView != null && mCamera == null && !LinphoneManager.getLc().isIncall()) {
-			mCamera = Camera.open(mCurrentCameraId);
-			mVideoCaptureView.switchCamera(mCamera, mCurrentCameraId);
-			mCamera.startPreview();
-		} else if (isInCall) {
-			if (mInCallControls != null) {
-				mInCallControls.setVisibility(View.VISIBLE);
-				mCall.setVisibility(View.GONE);
-			}
-			
-			if (mSwitchCamera != null)
-				mSwitchCamera.setVisibility(View.INVISIBLE);
-		}
-	}
-
-	private boolean isCallEstablished()
-	{
-		if (LinphoneManager.getLc().getCalls().length == 0)
-			return false;
-		
-		LinphoneCall call = LinphoneManager.getLc().getCalls()[0];
-		LinphoneCall.State state = call.getState();
-		
-		return state == LinphoneCall.State.Connected ||
-				state == LinphoneCall.State.CallUpdated ||
-				state == LinphoneCall.State.CallUpdatedByRemote ||
-				state == LinphoneCall.State.Paused ||
-				state == LinphoneCall.State.PausedByRemote ||
-				state == LinphoneCall.State.StreamsRunning ||
-				state == LinphoneCall.State.Pausing ||
-				state == LinphoneCall.State.Resuming;
-	}
-
-	@Override
-	public boolean onKeyDown(int keyCode, KeyEvent event) {
-		if (LinphoneUtils.onKeyVolumeSoftAdjust(keyCode)) return true;
-		boolean isInCall = LinphoneManager.getLc().isIncall();
-		isInCall = isInCall || LinphoneManager.getLc().getCallsNb() > 0;
-		if (keyCode == KeyEvent.KEYCODE_BACK && isInCall) {
-			// If we are in call on dialer, we go back to the incall view
-			LinphoneActivity.instance().startIncallActivity();
-			return true;
-		}
-		return super.onKeyDown(keyCode, event);
-	}
-}
diff --git a/src/org/linphone/FirstLoginActivity.java b/src/org/linphone/FirstLoginActivity.java
deleted file mode 100644
index 67c2c5c2e..000000000
--- a/src/org/linphone/FirstLoginActivity.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
-IncallActivity.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 org.linphone.core.Log;
-import org.linphone.core.LinphoneCore.RegistrationState;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-import android.widget.Toast;
-
-public class FirstLoginActivity extends Activity implements OnClickListener {
-
-	private TextView login;
-	private TextView password;
-	private SharedPreferences mPref;
-	private ProgressBar bar;
-	static FirstLoginActivity instance;
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.first_login_view);
-		mPref = PreferenceManager.getDefaultSharedPreferences(this);
-		setDefaultDomain(getString(R.string.default_domain));
-		
-		login = (TextView) findViewById(R.id.login);
-		login.setText(mPref.getString(getString(R.string.pref_username_key), ""));
-
-		password = (TextView) findViewById(R.id.password);
-        password.setText(mPref.getString(getString(R.string.pref_passwd_key), ""));
-
-        bar = (ProgressBar) findViewById(R.id.progress_bar);
-        bar.setVisibility(View.INVISIBLE);
-
-        
-		findViewById(R.id.connect).setOnClickListener(this);
-		instance = this;
-	}
-
-	private void setDefaultDomain(String string) {
-		String domain = mPref.getString(getString(R.string.pref_domain_key), "");
-		if (domain.length() != 0) return;
-
-		writePreference(R.string.pref_domain_key, getString(R.string.default_domain));
-	}
-
-	public void onClick(View v) {
-		if (login.getText() == null || login.length() == 0
-				|| password.getText() == null || password.length() == 0) {
-			toast(R.string.first_launch_no_login_password);
-			return;
-		}
-
-        InputMethodManager imm = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE);
-        imm.hideSoftInputFromWindow(this.getCurrentFocus().getWindowToken(), 0);
-
-		writePreference(R.string.pref_username_key, login.getText().toString());
-		writePreference(R.string.pref_passwd_key, password.getText().toString());
-
-		LinphoneManager.getInstance().initializePayloads();
-
-		try {
-			LinphoneManager.getInstance().initFromConf();
-		} catch (Throwable e) {
-			Log.e(e, "Error while initializing from config in first login activity");
-            toast(R.string.error);;
-		}
-	}
-
-	
-	
-	private void writePreference(int key, String value) {
-		mPref.edit().putString(getString(key), value).commit();
-	}
-
-	@Override
-	protected void onDestroy() {
-		instance = null;
-		super.onDestroy();
-	}
-
-	public void onRegistrationStateChanged(RegistrationState state) {
-		if (RegistrationState.RegistrationOk == state) {
-			bar.setVisibility(View.INVISIBLE);
-			toast(R.string.first_launch_ok);
-			mPref.edit().putBoolean(getString(R.string.first_launch_suceeded_once_key), true).commit();
-			setResult(RESULT_OK);
-			finish();
-		} else if (RegistrationState.RegistrationFailed == state) {
-			bar.setVisibility(View.INVISIBLE);
-			toast(R.string.first_launch_bad_login_password);
-		} else if (RegistrationState.RegistrationProgress == state) {
-			bar.setVisibility(View.VISIBLE);
-		}
-	}
-
-	private void toast(int key) {
-		Toast.makeText(instance, instance.getString(key), Toast.LENGTH_LONG).show();
-	}
-
-}
diff --git a/src/org/linphone/HistoryActivity.java b/src/org/linphone/HistoryActivity.java
deleted file mode 100644
index 8be51601e..000000000
--- a/src/org/linphone/HistoryActivity.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
-DialerActivity.java
-Copyright (C) 2010  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 java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.linphone.core.CallDirection;
-import org.linphone.core.LinphoneAddress;
-import org.linphone.core.LinphoneCallLog;
-import org.linphone.core.LinphoneCore;
-import org.linphone.core.LinphoneProxyConfig;
-import org.linphone.core.Log;
-
-import android.app.ListActivity;
-import android.content.Context;
-import android.net.Uri;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.ImageView;
-import android.widget.ListView;
-import android.widget.TextView;
-
-public class HistoryActivity extends ListActivity {
-	LayoutInflater mInflater;  
-	@Override
-	    public void onCreate(Bundle savedInstanceState) {
-	        super.onCreate(savedInstanceState);
-	        mInflater = (LayoutInflater)getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-	    }
-	
-	  
-	  @Override
-	protected void onListItemClick(ListView l, View v, int position, long id) {
-		super.onListItemClick(l, v, position, id);
-		TextView lFirstLineView = (TextView) v.findViewById(R.id.history_cell_first_line);
-		TextView lSecondLineView = (TextView) v.findViewById(R.id.history_cell_second_line);
-		ContactPicked parent = (ContactPicked) getParent();
-		if (lSecondLineView.getVisibility() == View.GONE) {
-			// no display name
-			parent.setAddressAndGoToDialer(lFirstLineView.getText().toString(), null, null);
-		} else {
-			parent.setAddressAndGoToDialer(
-					lSecondLineView.getText().toString(),
-					lFirstLineView.getText().toString(),
-					null);
-		}
-	}
-
-
-	@Override
-	protected void onResume() {
-		super.onResume();
-		 setListAdapter(new CallHistoryAdapter(this));
-	}
-
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-		// Inflate the currently selected menu XML resource.
-		MenuInflater inflater = getMenuInflater();
-		inflater.inflate(R.menu.history_activity_menu, menu);
-		return true;
-	}
-	
-	// Fix the menu from crashing the activity
-	@Override
-	public boolean onPrepareOptionsMenu(Menu menu) {
-		return true;
-	}
-
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item) {
-		int id = item.getItemId();
-		if (id == R.id.menu_clear_history) {
-			LinphoneManager.getLc().clearCallLogs();
-			setListAdapter(new CallHistoryAdapter(this));
-		}
-		else {
-			Log.e("Unknown menu item [",item,"]");
-		}
-
-		return false;
-	}
-	
-	class CallHistoryAdapter extends  BaseAdapter {
-		final List<LinphoneCallLog> mLogs; 
-
-		CallHistoryAdapter(Context aContext) {
-			mLogs = Arrays.asList(LinphoneManager.getLc().getCallLogs());
-		}
-		public int getCount() {
-			return mLogs.size();
-		}
-
-		public Object getItem(int position) {
-			return position;
-		}
-
-		public long getItemId(int position) {
-			
-			return position;
-		}
-
-		public View getView(int position, View convertView, ViewGroup parent) {
-			View lView=null;
-			if (convertView !=null) {
-				lView = convertView;
-			} else {
-				lView = mInflater.inflate(R.layout.history_cell, parent,false);
-				
-			}
-			LinphoneCallLog lLog = mLogs.get(position);
-			LinphoneAddress lAddress;
-			TextView lFirstLineView = (TextView) lView.findViewById(R.id.history_cell_first_line);
-			TextView lSecondLineView = (TextView) lView.findViewById(R.id.history_cell_second_line);
-			ImageView lDirectionImageIn = (ImageView) lView.findViewById(R.id.history_cell_icon_in);
-			ImageView lDirectionImageOut = (ImageView) lView.findViewById(R.id.history_cell_icon_out);
-			ImageView lContactPicture = (ImageView) lView.findViewById(R.id.history_cell_icon_contact);
-			
-			if (lLog.getDirection() == CallDirection.Incoming) {
-				lAddress = lLog.getFrom();
-				lDirectionImageIn.setVisibility(View.VISIBLE);
-				lDirectionImageOut.setVisibility(View.GONE);
-				
-			} else {
-				lAddress = lLog.getTo();
-				lDirectionImageIn.setVisibility(View.GONE);
-				lDirectionImageOut.setVisibility(View.VISIBLE);
-			}
-
-			Uri uri = LinphoneUtils.findUriPictureOfContactAndSetDisplayName(lAddress, getContentResolver());
-			LinphoneUtils.setImagePictureFromUri(lView.getContext(), lContactPicture, uri, R.drawable.unknown_person);
-
-			LinphoneCore lc = LinphoneManager.getLc();
-			LinphoneProxyConfig lProxyConfig = lc.getDefaultProxyConfig();
-			boolean showOnlyUsername = getResources().getBoolean(R.bool.show_only_username_in_history);
-			String lDetailedName=null;
-			String lDisplayName = !showOnlyUsername ? lAddress.getDisplayName() : null; 
-			if (showOnlyUsername || (lProxyConfig != null && lProxyConfig.getDomain().equals(lAddress.getDomain()))) {
-				lDetailedName = lAddress.getUserName();
-			} else {
-				lDetailedName = lAddress.asStringUriOnly();
-			}
-
-			if (lDisplayName == null) {
-				lFirstLineView.setText(lDetailedName);
-				lSecondLineView.setVisibility(View.GONE);
-			} else {
-				lFirstLineView.setText(lDisplayName);
-				lSecondLineView.setText(lDetailedName);
-				lSecondLineView.setVisibility(View.VISIBLE);
-			}
-
-			return lView;
-			
-		}
-		  
-	  }
-}
diff --git a/src/org/linphone/IncallActivity.java b/src/org/linphone/IncallActivity.java
deleted file mode 100644
index f18a81b3e..000000000
--- a/src/org/linphone/IncallActivity.java
+++ /dev/null
@@ -1,857 +0,0 @@
-/*
-IncallActivity.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 static android.view.View.GONE;
-import static android.view.View.VISIBLE;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.List;
-
-import org.linphone.LinphoneSimpleListener.LinphoneOnAudioChangedListener;
-import org.linphone.LinphoneSimpleListener.LinphoneOnCallEncryptionChangedListener;
-import org.linphone.LinphoneSimpleListener.LinphoneOnCallStateChangedListener;
-import org.linphone.core.LinphoneAddress;
-import org.linphone.core.LinphoneCall;
-import org.linphone.core.LinphoneCall.State;
-import org.linphone.core.LinphoneCallParams;
-import org.linphone.core.LinphoneCore.MediaEncryption;
-import org.linphone.core.LinphoneCoreException;
-import org.linphone.core.Log;
-import org.linphone.mediastream.Version;
-import org.linphone.ui.Numpad;
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.res.Configuration;
-import android.content.res.Resources;
-import android.os.Bundle;
-import android.os.CountDownTimer;
-import android.os.Handler;
-import android.text.TextUtils;
-import android.view.KeyEvent;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.View.OnLongClickListener;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.Checkable;
-import android.widget.ImageView;
-import android.widget.ListAdapter;
-import android.widget.TextView;
-import android.widget.Toast;
-
-/**
- * @author Guillaume Beraudo
- */
-public class IncallActivity extends AbstractCalleesActivity implements
-		LinphoneOnAudioChangedListener,
-		LinphoneOnCallStateChangedListener,
-		LinphoneOnCallEncryptionChangedListener,
-		Comparator<LinphoneCall>,
-		OnLongClickListener,
-		OnClickListener {
-
-	private boolean mUnMuteOnReturnFromUriPicker;
-
-	private static final int numpadDialogId = 1;
-	private static final int addCallId = 1;
-	private static final int transferCallId = 2;
-	private static final int promptVideoId = 3;
-
-	private static IncallActivity instance;
-	private CountDownTimer timer;
-	public static boolean active;
-	@Override protected synchronized void setActive(boolean a) {active = a;}
-	@Override protected synchronized boolean isActive() {return active;}
-
-	public static boolean isReady() {
-		return instance!=null;
-	}
-	
-	static IncallActivity instance()  {
-		if (isReady()) return instance;
-		return null;
-	}
-	
-	private void pauseCurrentCallOrLeaveConference() {
-		LinphoneCall call = lc().getCurrentCall();
-		if (call != null && !call.isInConference()) {
-			lc().pauseCall(call);
-		} else {
-			lc().leaveConference();
-			updateConfItem();
-		}
-	}
-
-	private View mConferenceVirtualCallee;
-	private int mMultipleCallsLimit;
-	private boolean mAllowTransfers;
-	
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {	
-		setActive(true);	
-		
-		if (finishIfAutoRestartAfterACrash(savedInstanceState)) {
-			setActive(false);
-			return;
-		}
-		
-		if (!Version.isXLargeScreen(this))
-		    setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-		
-		setContentView(R.layout.incall_layout);
-		instance = this;
-		
-		mAllowTransfers = getResources().getBoolean(R.bool.allow_transfers);
-
-		findViewById(R.id.addCall).setOnClickListener(this);
-
-		findViewById(R.id.incallNumpadShow).setOnClickListener(this);
-		findViewById(R.id.conf_simple_merge).setOnClickListener(this);
-		findViewById(R.id.conf_simple_pause).setOnClickListener(this);
-
-		findViewById(R.id.incallHang).setOnClickListener(this);
-		mMultipleCallsLimit = lc().getMaxCalls();
-
-		mConferenceVirtualCallee = findViewById(R.id.conf_header);
-		mConferenceVirtualCallee.setOnClickListener(this);
-		mConferenceVirtualCallee.setOnLongClickListener(this);
-		enableView(mConferenceVirtualCallee, R.id.conf_header_details, this, true);
-
-
-		boolean mMayDoVideo = Version.isVideoCapable() && LinphoneManager.getInstance().isVideoEnabled();
-		if (mMayDoVideo) {
-			findViewById(R.id.conf_simple_video).setOnClickListener(this);
-		} else {
-			findViewById(R.id.conf_simple_video).setVisibility(View.GONE);
-		}
-		super.onCreate(savedInstanceState);
-	}
-	
-	@Override
-	protected void onPause() {
-		setActive(false);
-		instance = null;
-		super.onPause();
-	}
-
-	@Override
-	protected boolean shouldFinishCalleeActivity() {
-		return lc().getCallsNb() == 0;
-	}
-	
-	@Override
-	protected CalleeListAdapter createCalleeListAdapter() {
-		return new IncallListAdapter();
-	}
-
-
-
-	@Override
-	protected List<LinphoneCall> updateSpecificCallsList() {
-		return LinphoneUtils.getLinphoneCallsNotInConf(lc());
-	}
-
-
-
-	private void updateSoundLock() {
-		boolean locked = lc().soundResourcesLocked();
-		findViewById(R.id.addCall).setEnabled(!locked);
-	}
-
-	private void updateAddCallButton() {
-		boolean limitReached = false;
-		if (mMultipleCallsLimit > 0) {
-			limitReached = lc().getCallsNb() >= mMultipleCallsLimit;
-		}
-		findViewById(R.id.addCall).setVisibility(limitReached? View.INVISIBLE : VISIBLE);
-	}
-
-	private void updateNumpadButton() {
-		LinphoneCall currentCall = lc().getCurrentCall();
-		boolean enable = currentCall != null && currentCall.getState() == State.StreamsRunning;
-		findViewById(R.id.incallNumpadShow).setEnabled(enable);
-	}
-
-	private void updateCalleeImage() {
-		ImageView view = (ImageView) findViewById(R.id.incall_picture);
-		LinphoneCall currentCall = lc().getCurrentCall();
-
-		if (currentCall == null || lc().getCallsNb() != 1) {
-			view.setVisibility(GONE);
-			return;
-		}
-
-		setCalleePicture(view, currentCall.getRemoteAddress());
-		view.setVisibility(VISIBLE);
-	}
-
-	private void acceptCallUpdate(boolean accept, int id) {
-		 removeDialog(id);
-		 timer.cancel();
-		 
-		 LinphoneCall call = LinphoneManager.getLc().getCurrentCall();
-		 if (call == null)
-			 return;
-		 
-		 LinphoneCallParams params = call.getCurrentParamsCopy();
-		 if (accept) {
-			 params.setVideoEnabled(true);
-			 LinphoneManager.getLc().enableVideo(true, true);
-		 }
-		 
-		 try {
-			LinphoneManager.getLc().acceptCallUpdate(call, params);
-		 } catch (LinphoneCoreException e) {
-			e.printStackTrace();
-		 }
-		 
-		 updateUI();
-	}
-
-	@Override
-	protected Dialog onCreateDialog(final int id) {
-		switch (id) {
-		case promptVideoId:
-			AlertDialog.Builder builder = new AlertDialog.Builder(this);
-			builder.setTitle(R.string.dynamic_video_asking);
-			builder.setNegativeButton(R.string.dynamic_video_deny, new
-					 DialogInterface.OnClickListener() {
-						 public void onClick(DialogInterface dialog, int whichButton)
-						 {
-							 acceptCallUpdate(false, id);
-						 }
-					 });
-			builder.setPositiveButton(R.string.dynamic_video_accept, new
-					 DialogInterface.OnClickListener() {
-						 public void onClick(DialogInterface dialog, int whichButton)
-						 {
-							 acceptCallUpdate(true, id);
-						 }
-					 });
-			return builder.create();
-		case numpadDialogId:
-			Numpad numpad = new Numpad(this, true);
-			return new AlertDialog.Builder(this).setView(numpad)
-			// .setIcon(R.drawable.logo_linphone_57x57)
-					// .setTitle("Send DTMFs")
-					 .setPositiveButton(R.string.close_button_text, new
-					 DialogInterface.OnClickListener() {
-						 public void onClick(DialogInterface dialog, int whichButton)
-							 {
-							 	dismissDialog(id);
-							 }
-						 })
-					.create();
-		default:
-			throw new IllegalArgumentException("unkown dialog id " + id);
-		}
-	}
-
-	private LinphoneCall mActivateCallOnReturnFromUriPicker;
-	private boolean mEnterConferenceOnReturnFromUriPicker;
-	private void openUriPicker(String pickerType, int requestCode) {
-		if (lc().soundResourcesLocked()) {
-			Toast.makeText(this, R.string.not_ready_to_make_new_call, Toast.LENGTH_LONG).show();
-			return;
-		}
-		mActivateCallOnReturnFromUriPicker = lc().getCurrentCall();
-		mEnterConferenceOnReturnFromUriPicker = lc().isInConference();
-		pauseCurrentCallOrLeaveConference();
-		Intent intent = new Intent().setClass(this, UriPickerActivity.class);
-		intent.putExtra(UriPickerActivity.EXTRA_PICKER_TYPE, pickerType);
-		startActivityForResult(intent, requestCode);
-		if (!lc().isMicMuted()) {
-			mUnMuteOnReturnFromUriPicker = true;
-			lc().muteMic(true);
-			((Checkable) findViewById(R.id.toggleMuteMic)).setChecked(true);
-		}
-	}
-
-	
-	@Override
-	public boolean onLongClick(View v) {
-		if (v.getId() == R.id.conf_header || v.getId() == R.id.conf_header_details) {
-			if (!lc().isInConference()) {
-				// make sure we are in the conference
-				// especially due to the difficulty to aim at the detail button.
-				lc().enterConference();
-			}
-			LinphoneActivity.instance().startConferenceDetailsActivity();
-			return true;
-		}
-		return false;
-	}
-
-	private void enterConferenceAndVirtualConfView(boolean enterConf) {
-		if (enterConf) {
-			boolean success = lc().enterConference();
-			if (success) {
-				mConferenceVirtualCallee.setBackgroundResource(R.drawable.conf_callee_active_bg);
-			}
-		} else {
-			lc().leaveConference();
-			mConferenceVirtualCallee.setBackgroundResource(R.drawable.conf_callee_bg);
-		}
-	}
-	
-	private void terminateCurrentCallOrConferenceOrAll() {
-		LinphoneCall currentCall = lc().getCurrentCall();
-		if (currentCall != null) {
-			lc().terminateCall(currentCall);
-		} else if (lc().isInConference()) {
-			lc().terminateConference();
-		} else {
-			lc().terminateAllCalls();
-		}
-
-		// activity will be closed automatically by LinphoneActivity when no more calls exist
-	}
-
-	public void onClick(View v) {
-		int id = v.getId();
-		if (id == R.id.addCall) {
-			finish();
-		}
-		else if (id == R.id.incallHang) {
-			terminateCurrentCallOrConferenceOrAll();
-		}
-		else if (id == R.id.conf_header) {
-			boolean enterConf = !lc().isInConference();
-			enterConferenceAndVirtualConfView(enterConf);
-		}
-		else if (id == R.id.conf_header_details) {
-			onLongClick(v);
-		}
-		else if (id == R.id.incallNumpadShow) {
-			showDialog(numpadDialogId);
-		}
-		else if (id == R.id.conf_simple_merge) {
-			if (!lc().soundResourcesLocked()) {
-				lc().addAllToConference();
-			}
-		}
-		else if (id == R.id.conf_simple_pause) {
-			LinphoneCall call = lc().getCurrentCall();
-			if (call != null) {
-				lc().pauseCall(call);
-			} else {
-				((Checkable) v).setChecked(true);
-				List<LinphoneCall> pausedCalls = LinphoneUtils.getCallsInState(lc(), Arrays.asList(State.Paused));
-				if (pausedCalls.size() == 1) {
-					LinphoneCall callToResume = pausedCalls.get(0);
-					lc().resumeCall(callToResume);
-				}
-			}
-		}
-		else if (id == R.id.conf_simple_video) {
-			LinphoneCall vCall = lc().getCurrentCall();
-			if (vCall != null) {
-				if (!vCall.cameraEnabled() && vCall.getCurrentParamsCopy().getVideoEnabled()) {
-					// NoWebcam mode, we let it this way
-					LinphoneActivity.instance().startVideoActivity(vCall, 0);
-				}
-				else if (!LinphoneManager.getInstance().addVideo()) {
-					LinphoneActivity.instance().startVideoActivity(vCall, 0);
-				}
-			}
-		}
-		else {
-			// mic, speaker
-			super.onClick(v);
-		}
-	}
-
-//	private void doTransfer() {
-//		LinphoneCall tCall = lc().getCurrentCall();
-//		if (tCall != null) {
-//			prepareForTransferingExistingOrNewCall(tCall);
-//		}
-//	}
-	
-	private void prepareForTransferingExistingOrNewCall(final LinphoneCall call) {
-		// Include inconf calls
-		final List<LinphoneCall> existingCalls = LinphoneUtils.getLinphoneCalls(lc());
-		if (existingCalls.size() == 1) {
-			// Only possible choice is transfer to new call: doing it directly.
-			mCallToTransfer = call;
-			openUriPicker(UriPickerActivity.EXTRA_PICKER_TYPE_TRANSFER, transferCallId);
-			return;
-		}
-		existingCalls.remove(call);
-		final List<String> numbers = new ArrayList<String>(existingCalls.size() + 1);
-		Resources r = getResources();
-		for(LinphoneCall c : existingCalls) {
-			numbers.add(LinphoneManager.extractADisplayName(r, c.getRemoteAddress()));
-		}
-		numbers.add(getString(R.string.transfer_to_new_call));
-		ListAdapter adapter = new ArrayAdapter<String>(IncallActivity.this, android.R.layout.select_dialog_item, numbers);
-		DialogInterface.OnClickListener l = new DialogInterface.OnClickListener() {
-			public void onClick(DialogInterface dialog, int which) {
-				if (which == numbers.size() -1) {
-					// Last one is transfer to new call
-					mCallToTransfer = call;
-					openUriPicker(UriPickerActivity.EXTRA_PICKER_TYPE_TRANSFER, transferCallId);
-				} else {
-					lc().transferCallToAnother(call, existingCalls.get(which));
-				}
-			}
-		};
-		new AlertDialog.Builder(IncallActivity.this).setTitle(R.string.transfer_dialog_title).setAdapter(adapter, l).create().show();
-	}
-
-	private class CallActionListener implements OnClickListener {
-		private LinphoneCall call;
-		private Dialog dialog;
-		public CallActionListener(LinphoneCall call, Dialog dialog) {
-			this.call = call;
-			this.dialog = dialog;
-		}
-		public void onClick(View v) {
-			int id =v.getId();
-			if (id == R.id.merge_to_conference) {
-				lc().addToConference(call);
-			}
-			else if (id == R.id.terminate_call) {
-				lc().terminateCall(call);
-			}
-			else if (id == R.id.transfer_existing) {
-				prepareForTransferingExistingOrNewCall(call);
-			}
-			else if (id == R.id.transfer_new) {
-				openUriPicker(UriPickerActivity.EXTRA_PICKER_TYPE_TRANSFER, transferCallId);
-				mCallToTransfer = call;	
-			}
-			else if (id == R.id.addVideo) {
-				if (!call.cameraEnabled() && call.getCurrentParamsCopy().getVideoEnabled()) {
-					// NoWebcam mode, we let it this way
-					LinphoneActivity.instance().startVideoActivity(call, 0);
-				}
-				else if (!LinphoneManager.getInstance().addVideo()) {
-					LinphoneActivity.instance().startVideoActivity(call, 0);
-				}
-			}
-			else if (id == R.id.set_auth_token_verified) {
-				call.setAuthenticationTokenVerified(true);
-			}
-			else if (id == R.id.set_auth_token_not_verified) {
-				call.setAuthenticationTokenVerified(false);
-			}
-			else if (id == R.id.encrypted) {
-				call.setAuthenticationTokenVerified(!call.isAuthenticationTokenVerified());
-			}
-			else {
-				throw new RuntimeException("unknown id " + v.getId());
-			}
-			if (dialog != null) dialog.dismiss();
-		}
-	}
-
-	private class IncallListAdapter extends CalleeListAdapter {
-		private boolean aConferenceIsPossible() {
-			if (lc().getCallsNb() < 2) {
-				return false;
-			}
-			int count = 0;
-			boolean aConfExists = lc().getConferenceSize() > 0;
-			for (LinphoneCall call : getSpecificCalls()) {
-				final LinphoneCall.State state = call.getState();
-				boolean connectionEstablished = state == State.StreamsRunning
-						|| state == State.Paused
-						|| state == State.PausedByRemote;
-				if (connectionEstablished)
-					count++;
-				if ((aConfExists && count >= 1) || count >= 2)
-					return true;
-			}
-			return false;
-		}
-
-		private Collection<State> mStatesToHighlight = Arrays.asList(
-				State.StreamsRunning, 
-				State.OutgoingRinging,
-				State.OutgoingEarlyMedia,
-				State.OutgoingInit,
-				State.OutgoingProgress);
-
-		public View getView(int position, View v, ViewGroup parent) {
-			if (v == null) {
-				if (Version.sdkAboveOrEqual(Version.API06_ECLAIR_201)) {
-					v = getLayoutInflater().inflate(R.layout.conf_callee, null);
-				} else {
-					v = getLayoutInflater().inflate(R.layout.conf_callee_older_devices, null);
-				}
-			}
-
-			final LinphoneCall call = getItem(position);
-			final LinphoneCall.State state = call.getState();
-
-			LinphoneAddress address = call.getRemoteAddress();
-			TextView mainTextView = (TextView) v.findViewById(R.id.name);
-			if (!TextUtils.isEmpty(address.getDisplayName())) {
-				mainTextView.setText(address.getDisplayName());
-			} else {
-				mainTextView.setText(address.getUserName());
-			}
-			String statusLabel = getStateText(state);
-			((TextView) v.findViewById(R.id.address)).setText(statusLabel);
-
-
-			boolean highlighted = mStatesToHighlight.contains(state);
-
-			int bgDrawableId = R.drawable.conf_callee_selector_normal;
-			if (state == State.IncomingReceived) {
-				bgDrawableId = R.drawable.conf_callee_selector_incoming;
-			} else if (highlighted) {
-				bgDrawableId = R.drawable.conf_callee_selector_active;
-			}
-			v.setBackgroundResource(bgDrawableId);
-
-			final boolean connectionEstablished = state == State.StreamsRunning
-					|| state == State.Paused
-					|| state == State.PausedByRemote;
-
-			boolean statusPaused = state== State.Paused || state == State.PausedByRemote;
-			setVisibility(v, R.id.callee_status_paused, statusPaused);
-			setVisibility(v, R.id.callee_status_qos, !statusPaused);
-
-			final OnLongClickListener showCallActionsLongListener = new OnLongClickListener() {
-				public boolean onLongClick(View v) {
-					if (lc().soundResourcesLocked()) {
-						return false;
-					}
-					View content = getLayoutInflater().inflate(R.layout.conf_choices_dialog, null);
-					Dialog dialog = new AlertDialog.Builder(IncallActivity.this).setView(content).create();
-					OnClickListener l = new CallActionListener(call, dialog);
-					enableView(content, R.id.transfer_existing, l, mAllowTransfers && getSpecificCalls().size() >=2);
-					enableView(content, R.id.transfer_new, l, mAllowTransfers);
-					boolean showMergeToConf = connectionEstablished && aConferenceIsPossible();
-					enableView(content, R.id.merge_to_conference, l, showMergeToConf);
-					enableView(content, R.id.terminate_call, l, true);
-
-					if (call.getCurrentParamsCopy().getMediaEncryption()==MediaEncryption.ZRTP) {
-						boolean authVerified = call.isAuthenticationTokenVerified();
-						String fmt = getString(authVerified ? R.string.reset_sas_fmt : R.string.verify_sas_fmt);
-						TextView token = (TextView) content.findViewById(R.id.authentication_token);
-						token.setText(String.format(fmt, call.getAuthenticationToken()));
-						enableView(content, R.id.set_auth_token_not_verified, l, authVerified);
-						enableView(content, R.id.set_auth_token_verified, l, !authVerified);
-						enableView(content, R.id.encrypted, l, true);
-					} else {
-						setVisibility(content, R.id.encrypted, false);
-					}
-
-					dialog.show();
-					return true;
-				}
-			};
-			v.setOnLongClickListener(showCallActionsLongListener);
-
-			OnClickListener showCallActionsSimpleListener = new OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					showCallActionsLongListener.onLongClick(v);
-				}
-			};
-
-			MediaEncryption mediaEncryption = call.getCurrentParamsCopy().getMediaEncryption();
-			if (MediaEncryption.None == mediaEncryption) {
-				setVisibility(v, R.id.callee_status_secured, false);
-				setVisibility(v, R.id.callee_status_maybe_secured, false);
-				setVisibility(v, R.id.callee_status_not_secured, false);
-			} else if (MediaEncryption.ZRTP == mediaEncryption ) {
-				boolean reallySecured = call.isAuthenticationTokenVerified();
-				enableView(v, R.id.callee_status_secured, showCallActionsSimpleListener, reallySecured);
-				enableView(v, R.id.callee_status_maybe_secured, showCallActionsSimpleListener, !reallySecured);
-				enableView(v, R.id.callee_status_not_secured, showCallActionsSimpleListener, false);
-			} else {
-				setVisibility(v, R.id.callee_status_secured, true);
-				setVisibility(v, R.id.callee_status_maybe_secured, false);
-				setVisibility(v, R.id.callee_status_not_secured, false);
-			}
-
-			v.setOnClickListener(new OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					State actualState = call.getState();
-					if (State.StreamsRunning == actualState) {
-						lc().pauseCall(call);
-					} else if (State.PausedByRemote == actualState) {
-						String msg = getString(R.string.cannot_resume_paused_by_remote_call);
-						Toast.makeText(IncallActivity.this, msg, Toast.LENGTH_SHORT).show();
-					} else if (lc().soundResourcesLocked()) {
-						return;
-					} else if (State.Paused == actualState) {
-						if (call != null && call.cameraEnabled() && call.getCurrentParamsCopy().getVideoEnabled())
-						{
-							finish();
-							LinphoneActivity.instance().startVideoActivity(call, 0);
-						}
-						lc().resumeCall(call);
-					}
-				}
-			});
-
-			ImageView pictureView = (ImageView) v.findViewById(R.id.picture);
-			if (lc().getCallsNb() != 1) {
-				// May be greatly sped up using a drawable cache
-				setCalleePicture(pictureView, address);
-			} else {
-				pictureView.setVisibility(GONE);
-			}
-
-			registerCallDurationTimer(v, call);
-			registerCallQualityListener(v, call);
-
-			enableView(v, R.id.callee_status_details, showCallActionsSimpleListener, true);
-
-			return v;
-		}
-	}
-
-	private String getStateText(State state) {
-		int id;
-		if (state == State.StreamsRunning) {
-			id=R.string.status_active_call;
-		} else if (state == State.Paused) {
-			id=R.string.state_paused;
-		} else if (state == State.PausedByRemote) {
-			id=R.string.state_paused_by_remote;
-		} else if (state == State.IncomingReceived) {
-			id=R.string.state_incoming_received;
-		} else if (state == State.OutgoingRinging) {
-			id=R.string.state_outgoing_ringing;
-		} else if (state == State.OutgoingProgress) {
-			id=R.string.state_outgoing_progress;
-		} else {
-			return "";
-		}
-		return getString(id);
-	}
-
-	private void updatePauseMergeButtons() {
-		View controls = findViewById(R.id.incall_controls_layout);
-
-		int nbCalls = lc().getCallsNb();
-		View pauseView = controls.findViewById(R.id.conf_simple_pause);
-		View mergeView = controls.findViewById(R.id.conf_simple_merge);
-
-		if (nbCalls <= 1) {
-			((Checkable) pauseView).setChecked(lc().getCurrentCall() == null);
-			mergeView.setVisibility(GONE);
-			pauseView.setVisibility(VISIBLE);
-			
-		} else {
-			int nonConfCallsNb = LinphoneUtils.countNonConferenceCalls(lc());
-			boolean enableMerge = nonConfCallsNb >=2;
-			enableMerge |= nonConfCallsNb >=1 && lc().getConferenceSize() > 0;
-			mergeView.setEnabled(enableMerge);
-			pauseView.setVisibility(GONE);
-			mergeView.setVisibility(VISIBLE);
-		}
-	}
-	
-	@Override
-	public void onConfigurationChanged(Configuration newConfig) 
-	{
-		if (!Version.isXLargeScreen(this))
-		{
-			// Do nothing to not recreate the activity on smartphone if screen is rotated
-			super.onConfigurationChanged(null);
-			return;
-		}
-		super.onConfigurationChanged(newConfig);
-	}
-
-	private void updateConfItem() {
-		boolean confExists = lc().getConferenceSize() > 0;
-		View confView = findViewById(R.id.conf_header);
-		confView.setVisibility(confExists? VISIBLE : GONE);
-
-		if (confExists) {
-			if (lc().isInConference()) {
-				confView.setBackgroundResource(R.drawable.conf_callee_selector_active);
-			} else {
-				confView.setBackgroundResource(R.drawable.conf_callee_selector_normal);
-			}
-		}
-	}
-
-	protected void updateUI() {
-		updatePauseMergeButtons();
-		updateCalleeImage();
-		updateSoundLock();
-		updateAddCallButton();
-		updateNumpadButton();
-		updateConfItem();
-
-		super.updateUI();
-	}
-
-	public int compare(LinphoneCall c1, LinphoneCall c2) {
-		if (c1 == c2)
-			return 0;
-
-		boolean inConfC1 = c1.isInConference();
-		boolean inConfC2 = c2.isInConference();
-		if (inConfC1 && !inConfC2)
-			return -1;
-		if (!inConfC1 && inConfC2)
-			return 1;
-
-		int durationDiff = c2.getDuration() - c1.getDuration();
-		return durationDiff;
-
-	}
-
-	private boolean checkValidTargetUri(String uri) {
-		boolean invalidUri;
-		try {
-			String target = lc().interpretUrl(uri).asStringUriOnly();
-			invalidUri = lc().isMyself(target);
-		} catch (LinphoneCoreException e) {
-			invalidUri = true;
-		}
-
-		if (invalidUri) {
-			String msg = String.format(getString(R.string.bad_target_uri), uri);
-			Toast.makeText(this, msg, Toast.LENGTH_SHORT).show();
-			return false;
-		}
-		return true;
-	}
-	
-	private LinphoneCall mCallToTransfer;
-	@Override
-	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-		if (mUnMuteOnReturnFromUriPicker) {
-			lc().muteMic(false);
-			((Checkable) findViewById(R.id.toggleMuteMic)).setChecked(false);
-		}
-
-		String uri = null;
-		if (data != null) {
-			uri = data.getStringExtra(UriPickerActivity.EXTRA_CALLEE_URI);
-		}
-		if (resultCode != RESULT_OK || TextUtils.isEmpty(uri)) {
-			mCallToTransfer = null;
-			eventuallyResumeConfOrCallOnPickerReturn(true);
-			return;
-		}
-
-
-		if (!checkValidTargetUri(uri)) {
-			eventuallyResumeConfOrCallOnPickerReturn(true);
-			return;
-		}
-
-		if (lc().soundResourcesLocked()) {
-			Toast.makeText(this, R.string.not_ready_to_make_new_call, Toast.LENGTH_LONG).show();
-			eventuallyResumeConfOrCallOnPickerReturn(true);
-			return;
-		}
-		
-		switch (requestCode) {
-		case addCallId:
-			try {
-				lc().invite(uri);
-				eventuallyResumeConfOrCallOnPickerReturn(false);
-			} catch (LinphoneCoreException e) {
-				Log.e(e);
-				Toast.makeText(this, R.string.error_adding_new_call, Toast.LENGTH_LONG).show();
-			}
-			break;
-		case transferCallId:
-			lc().transferCall(mCallToTransfer, uri);
-			// don't re-enter conference if call to transfer from conference
-			boolean doResume = !mCallToTransfer.isInConference();
-			// don't resume call if it is the call to transfer
-			doResume &= mActivateCallOnReturnFromUriPicker != mCallToTransfer;
-			eventuallyResumeConfOrCallOnPickerReturn(doResume);
-			Toast.makeText(this, R.string.transfer_started, Toast.LENGTH_LONG).show();
-			break;
-		default:
-			throw new RuntimeException("unhandled request code " + requestCode);
-		}
-	}
-
-	private void eventuallyResumeConfOrCallOnPickerReturn(boolean doCallConfResuming) {
-		if (doCallConfResuming) {
-			if (mActivateCallOnReturnFromUriPicker != null) {
-				lc().resumeCall(mActivateCallOnReturnFromUriPicker);
-			} else if (mEnterConferenceOnReturnFromUriPicker) {
-				enterConferenceAndVirtualConfView(true);
-			}
-		}
-		mActivateCallOnReturnFromUriPicker = null;
-		mEnterConferenceOnReturnFromUriPicker = false;
-	}
-
-	@Override
-	public boolean onKeyDown(int keyCode, KeyEvent event) {
-		if (LinphoneUtils.onKeyVolumeSoftAdjust(keyCode)) return true;
-		if (LinphoneUtils.onKeyBackGoHome(this, keyCode, event)) return true;
-		return super.onKeyDown(keyCode, event);
-	}
-
-
-	private Handler mHandler = new Handler();
-	@Override
-	public void onCallEncryptionChanged(LinphoneCall call, boolean encrypted,
-			String authenticationToken) {
-		mHandler.post(new Runnable() {
-			public void run() {
-				updateUI();
-			}
-		});
-	}
-
-	@Override
-	public void onCallStateChanged(LinphoneCall call, final State state, String message) {
-		if (state == State.CallUpdatedByRemote) {
-			// If the correspondent proposes video while audio call
-			boolean remoteVideo = call.getRemoteParams().getVideoEnabled();
-			boolean localVideo = call.getCurrentParamsCopy().getVideoEnabled();
-			boolean autoAcceptCameraPolicy = LinphoneManager.getInstance().isAutoAcceptCamera();
-			if (remoteVideo && !localVideo && !autoAcceptCameraPolicy && !LinphoneManager.getLc().isInConference()) {
-				mHandler.post(new Runnable() {
-					public void run() {
-						showDialog(promptVideoId);
-						// We let 30 secs for the user to decide
-						timer = new CountDownTimer(30000, 1000) {
-							public void onTick(long millisUntilFinished) { }
-
-							public void onFinish() {
-								acceptCallUpdate(false, promptVideoId);
-					    	}
-						}.start();
-					}
-				});
-			}
-		}
-		super.onCallStateChanged(call, state, message);
-	}
-}
diff --git a/src/org/linphone/IncomingCallActivity.java b/src/org/linphone/IncomingCallActivity.java
index f7afc26fc..aadb04bec 100644
--- a/src/org/linphone/IncomingCallActivity.java
+++ b/src/org/linphone/IncomingCallActivity.java
@@ -23,8 +23,8 @@ import java.util.List;
 import org.linphone.LinphoneSimpleListener.LinphoneOnCallStateChangedListener;
 import org.linphone.core.LinphoneAddress;
 import org.linphone.core.LinphoneCall;
-import org.linphone.core.Log;
 import org.linphone.core.LinphoneCall.State;
+import org.linphone.core.Log;
 import org.linphone.ui.SlidingTab;
 import org.linphone.ui.SlidingTab.OnTriggerListener;
 
@@ -100,7 +100,7 @@ public class IncomingCallActivity extends Activity implements LinphoneOnCallStat
 		LinphoneAddress address = mCall.getRemoteAddress();
 		// May be greatly sped up using a drawable cache
 		Uri uri = LinphoneUtils.findUriPictureOfContactAndSetDisplayName(address, getContentResolver());
-		LinphoneUtils.setImagePictureFromUri(this, mPictureView, uri, R.drawable.unknown_person);
+		LinphoneUtils.setImagePictureFromUri(this, mPictureView, uri, R.drawable.unknown_small);
 
 		// To be done after findUriPictureOfContactAndSetDisplayName called
 		mNameView.setText(address.getDisplayName());
@@ -142,9 +142,9 @@ public class IncomingCallActivity extends Activity implements LinphoneOnCallStat
 			Toast.makeText(this, R.string.couldnt_accept_call, Toast.LENGTH_LONG);
 		} else {
 			if (mCall.getCurrentParamsCopy().getVideoEnabled())
-				LinphoneActivity.instance().startVideoActivity(mCall, 0);
+				LinphoneActivity.instance().startVideoActivity(mCall);
 			else
-				LinphoneActivity.instance().startIncallActivity();
+				LinphoneActivity.instance().startIncallActivity(mCall);
 		}
 	}
 	@Override
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index 755b9b0a9..58eb4a174 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -1,6 +1,7 @@
+package org.linphone;
 /*
 LinphoneActivity.java
-Copyright (C) 2010  Belledonne Communications, Grenoble, France
+Copyright (C) 2012  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
@@ -16,64 +17,62 @@ 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 static android.content.Intent.ACTION_MAIN;
 
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+
 import org.linphone.LinphoneSimpleListener.LinphoneOnCallStateChangedListener;
-import org.linphone.compatibility.Compatibility;
+import org.linphone.LinphoneSimpleListener.LinphoneOnMessageReceived;
+import org.linphone.LinphoneSimpleListener.LinphoneOnRegistrationStateChangedListener;
+import org.linphone.core.CallDirection;
+import org.linphone.core.LinphoneAddress;
 import org.linphone.core.LinphoneCall;
 import org.linphone.core.LinphoneCall.State;
-import org.linphone.core.LinphoneCore;
+import org.linphone.core.LinphoneCallLog;
+import org.linphone.core.LinphoneCallLog.CallStatus;
 import org.linphone.core.LinphoneCore.RegistrationState;
+import org.linphone.core.LinphoneCoreFactory;
 import org.linphone.core.Log;
-import org.linphone.mediastream.Version;
 
-import android.app.AlertDialog;
-import android.app.TabActivity;
-import android.content.Context;
-import android.content.DialogInterface;
+import android.app.Activity;
 import android.content.Intent;
-import android.content.SharedPreferences;
-import android.graphics.drawable.Drawable;
-import android.media.AudioManager;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
-import android.preference.PreferenceManager;
-import android.text.Html;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.OrientationEventListener;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.Fragment.SavedState;
+import android.support.v4.app.FragmentActivity;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentTransaction;
+import android.view.View;
+import android.view.View.OnClickListener;
 import android.view.WindowManager;
-import android.widget.TabHost.TabSpec;
-import android.widget.TabWidget;
+import android.widget.ImageView;
 import android.widget.TextView;
-import android.widget.Toast;
-	
-public class LinphoneActivity extends TabActivity implements ContactPicked
-		, LinphoneOnCallStateChangedListener
-		{
-	public static final String DIALER_TAB = "dialer";
+
+/**
+ * @author Sylvain Berfini
+ */
+public class LinphoneActivity extends FragmentActivity implements OnClickListener, ContactPicked, 
+										LinphoneOnCallStateChangedListener, 
+										LinphoneOnMessageReceived,
+										LinphoneOnRegistrationStateChangedListener {
     public static final String PREF_FIRST_LAUNCH = "pref_first_launch";
-    private static final int video_activity = 100;
-    private static final int FIRST_LOGIN_ACTIVITY = 101;
-    private static final int INCOMING_CALL_ACTIVITY = 103;
-	private static final int incall_activity = 104;
-	private static final int conferenceDetailsActivity = 105;
-    private static final String PREF_CHECK_CONFIG = "pref_check_config";
-
+	private static final int SETTINGS_ACTIVITY = 123;
+	private static final int callActivity = 19;
 	private static LinphoneActivity instance;
-	private OrientationEventListener mOrientationHelper;
+	private StatusFragment statusFragment;
+	private TextView missedCalls;
+	private ImageView history, contacts, dialer, settings, chat;
+	private FragmentsAvailable currentFragment;
+	private Fragment dialerFragment, messageListenerFragment;
+	private SavedState dialerSavedState;
+	private ChatStorage chatStorage;
 	private Handler mHandler = new Handler();
-
-	// Customization
-	private static boolean useFirstLoginActivity;
-	private static boolean useMenuSettings;
-	private static boolean useMenuAbout;
-	private boolean checkAccount;
+	private boolean isInCallLayout = false;
 	
 	static final boolean isInstanciated() {
 		return instance != null;
@@ -81,511 +80,457 @@ public class LinphoneActivity extends TabActivity implements ContactPicked
 	
 	public static final LinphoneActivity instance() {
 		if (instance != null) return instance;
-
 		throw new RuntimeException("LinphoneActivity not instantiated yet");
 	}
-
-	public void onCreate(Bundle savedInstanceState) {
+	
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		
-		if (Version.isXLargeScreen(this)) {
-			this.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
+        setContentView(R.layout.main);
+        instance = this;        
+        
+        if (findViewById(R.id.fragmentContainer) != null) {
+            if (savedInstanceState != null) {
+                return;
+            }
+            
+            dialerFragment = new DialerFragment();
+            dialerFragment.setArguments(getIntent().getExtras());
+            getSupportFragmentManager().beginTransaction()
+                    .add(R.id.fragmentContainer, dialerFragment).commit();
+            currentFragment = FragmentsAvailable.DIALER;
+            
+            initButtons();
+        }
+        
+        if (LinphoneManager.isInstanciated()) {
+			LinphoneManager.addListener(this);
 		}
-
-		if (!LinphoneManager.isInstanciated()) {
-			Log.e("No service running: avoid crash by starting the launcher", this.getClass().getName());
-			// super.onCreate called earlier
-			finish();
-			startActivity(getIntent().setClass(this, LinphoneLauncherActivity.class));
-			return;
-		}
-		instance = this;
-		setContentView(R.layout.main);
-		
-		@SuppressWarnings("deprecation")
-		int rotation = Compatibility.getRotation(getWindowManager().getDefaultDisplay());
-		// Inverse landscape rotation to initiate linphoneCore correctly
-		if (rotation == 270)
-			rotation = 90;
-		else if (rotation == 90)
-			rotation = 270;
-		
-		LinphoneManager.getLc().setDeviceRotation(rotation);
-		mAlwaysChangingPhoneAngle = rotation;
-
-		LinphonePreferenceManager.getInstance(this);
-		useFirstLoginActivity = getResources().getBoolean(R.bool.useFirstLoginActivity);
-		useMenuSettings = getResources().getBoolean(R.bool.useMenuSettings);
-		useMenuAbout = getResources().getBoolean(R.bool.useMenuAbout);
-		checkAccount = !useFirstLoginActivity;
-
-		SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(this);
-
-		if (!useFirstLoginActivity || pref.getBoolean(getString(R.string.first_launch_suceeded_once_key), false)) {
-			fillTabHost();
-		} else {
-			startActivityForResult(new Intent().setClass(this, FirstLoginActivity.class), FIRST_LOGIN_ACTIVITY);
-		}
-
-		if (checkAccount && !useFirstLoginActivity) {
-			if (pref.getBoolean(PREF_FIRST_LAUNCH, true)) {
-				onFirstLaunch();
-			} else if (!pref.getBoolean(PREF_CHECK_CONFIG, false)
-					&& !checkDefined(pref, R.string.pref_username_key, R.string.pref_domain_key)) {
-				onBadSettings(pref);
-			} else {
-				checkAccount = false;
-			}
-		}
-
-		LinphoneManager.addListener(this);
+        
+        int missedCalls = LinphoneManager.getLc().getMissedCallsCount();
+		displayMissedCalls(missedCalls);
 	}
 	
+	private void initButtons() {
+		history = (ImageView) findViewById(R.id.history);
+        history.setOnClickListener(this);
+        contacts  = (ImageView) findViewById(R.id.contacts);
+        contacts.setOnClickListener(this);
+        dialer = (ImageView) findViewById(R.id.dialer);
+        dialer.setOnClickListener(this);
+		dialer.setSelected(true);
+        settings = (ImageView) findViewById(R.id.settings);
+        settings.setOnClickListener(this);
+        chat = (ImageView) findViewById(R.id.chat);
+		chat.setOnClickListener(this);
+		missedCalls = (TextView) findViewById(R.id.missedCalls);
+	}
 	
+	private void changeCurrentFragment(FragmentsAvailable newFragmentType, Bundle extras) {
+		if (newFragmentType == currentFragment) {
+			return;
+		}
+		
+		if (currentFragment == FragmentsAvailable.DIALER) {
+			dialerSavedState = getSupportFragmentManager().saveFragmentInstanceState(dialerFragment);
+		}
+		
+		Fragment newFragment = null;
+		
+		switch (newFragmentType) {
+		case HISTORY:
+			newFragment = new HistoryFragment();
+			break;
+		case HISTORY_DETAIL:
+			newFragment = new HistoryDetailFragment();
+			break;
+		case CONTACTS:
+			newFragment = new ContactsFragment();
+			break;
+		case CONTACT:
+			newFragment = new ContactFragment();
+			break;
+		case DIALER:
+			newFragment = new DialerFragment();
+			if (extras == null) {
+				newFragment.setInitialSavedState(dialerSavedState);
+			}
+			dialerFragment = newFragment;
+			break;
+		case SETTINGS:
+			break;
+		case CHAT:
+			newFragment = new ChatFragment();
+			messageListenerFragment = newFragment;
+			break;
+		case CHATLIST:
+			newFragment = new ChatListFragment();
+			break;
+		}
+		
+		if (newFragment != null) {
+			newFragment.setArguments(extras);
+			currentFragment = newFragmentType;
+			changeFragment(newFragment);
+		}
+	}
+	
+	private void changeFragment(Fragment newFragment) {
+		FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+
+		if (currentFragment.shouldAddToBackStack()) {
+			if (!getResources().getBoolean(R.bool.disable_animations)) {
+				transaction.setCustomAnimations(R.anim.slide_in_right_to_left, R.anim.slide_out_right_to_left, R.anim.slide_in_left_to_right, R.anim.slide_out_left_to_right);
+			}
+			transaction.addToBackStack("Add to back stack");
+		}
+		else {
+			try {
+				getSupportFragmentManager().popBackStack("Add to back stack", FragmentManager.POP_BACK_STACK_INCLUSIVE);
+			} catch (java.lang.IllegalStateException e) {
+				
+			}
+		}
+		transaction.replace(R.id.fragmentContainer, newFragment);
+
+		transaction.commitAllowingStateLoss();
+	}
+	
+	public void displayHistoryDetail(String sipUri, LinphoneCallLog log) {
+		LinphoneAddress lAddress = LinphoneCoreFactory.instance().createLinphoneAddress(sipUri);
+		Uri uri = LinphoneUtils.findUriPictureOfContactAndSetDisplayName(lAddress, getContentResolver());
+		
+		Bundle extras = new Bundle();
+		extras.putString("SipUri", sipUri);
+		if (lAddress.getDisplayName() != null) {
+			extras.putString("DisplayName", lAddress.getDisplayName());
+			extras.putString("PictureUri", uri.toString());
+		}
+		
+		String status;
+		if (log.getDirection() == CallDirection.Outgoing) {
+			status = "Outgoing";
+		} else {
+			if (log.getStatus() == CallStatus.Missed) {
+				status = "Missed";
+			} else {
+				status = "Incoming";
+			}
+		}
+		extras.putString("CallStatus", status);
+		extras.putString("CallTime", secondsToDisplayableString(log.getCallDuration()));
+		extras.putString("CallDate", log.getStartDate());
+		
+		changeCurrentFragment(FragmentsAvailable.HISTORY_DETAIL, extras);
+	}
+	
+	private String secondsToDisplayableString(int secs) {
+		SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm:ss");
+		Calendar cal = Calendar.getInstance();
+		cal.set(0, 0, 0, 0, 0, secs);
+		return dateFormat.format(cal.getTime());
+	}
+	
+	public void displayContact(Contact contact) {
+		Bundle extras = new Bundle();
+		extras.putSerializable("Contact", contact);
+		changeCurrentFragment(FragmentsAvailable.CONTACT, extras);
+	}
+	
+	public void displayChat(String sipUri) {
+		LinphoneAddress lAddress = LinphoneCoreFactory.instance().createLinphoneAddress(sipUri);
+		Uri uri = LinphoneUtils.findUriPictureOfContactAndSetDisplayName(lAddress, getContentResolver());
+		
+		Bundle extras = new Bundle();
+		extras.putString("SipUri", sipUri);
+		if (lAddress.getDisplayName() != null) {
+			extras.putString("DisplayName", lAddress.getDisplayName());
+			extras.putString("PictureUri", uri.toString());
+		}
+		changeCurrentFragment(FragmentsAvailable.CHAT, extras);
+	}
+
+	@Override
+	public void onClick(View v) {
+		int id = v.getId();
+		resetSelection();
+		
+		if (id == R.id.history) {
+			changeCurrentFragment(FragmentsAvailable.HISTORY, null);
+			history.setSelected(true);
+			LinphoneManager.getLc().resetMissedCallsCount();
+			displayMissedCalls(0);
+		}
+		else if (id == R.id.contacts) {
+			changeCurrentFragment(FragmentsAvailable.CONTACTS, null);
+			contacts.setSelected(true);
+		}
+		else if (id == R.id.dialer) {
+			changeCurrentFragment(FragmentsAvailable.DIALER, null);
+			dialer.setSelected(true);
+		}
+		else if (id == R.id.settings) {
+			currentFragment = FragmentsAvailable.SETTINGS;
+//			if (Version.sdkAboveOrEqual(Version.API11_HONEYCOMB_30)) {
+//				changeCurrentFragment(FragmentsAvailable.SETTINGS, null);
+//				settings.setSelected(true);
+//			} else {
+				Intent intent = new Intent(ACTION_MAIN);
+				intent.setClass(this, PreferencesActivity.class);
+				startActivityForResult(intent, SETTINGS_ACTIVITY);
+//			}
+		}
+		else if (id == R.id.chat) {
+			changeCurrentFragment(FragmentsAvailable.CHATLIST, null);
+			chat.setSelected(true);
+		}
+	}
+	
+	private void resetSelection() {
+		history.setSelected(false);
+		contacts.setSelected(false);
+		dialer.setSelected(false);
+		settings.setSelected(false);
+		chat.setSelected(false);
+	}
+	
+	public void selectMenu(FragmentsAvailable menuToSelect) {
+		currentFragment = menuToSelect;
+		resetSelection();
+		
+		switch (menuToSelect) {
+		case HISTORY:
+		case HISTORY_DETAIL:
+			history.setSelected(true);
+			break;
+		case CONTACTS:
+		case CONTACT:
+			contacts.setSelected(true);
+			break;
+		case DIALER:
+			dialer.setSelected(true);
+			break;
+		case SETTINGS:
+			settings.setSelected(true);
+			break;
+		case CHAT:
+		case CHATLIST:
+			chat.setSelected(true);
+			break;
+		}
+	}
+
+	public void updateDialerFragment(DialerFragment fragment) {
+		dialerFragment = fragment;
+		// Hack to maintain ADJUST_PAN flag
+		getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN);
+	}
+	
+	public void updateChatFragment(ChatFragment fragment) {
+		messageListenerFragment = fragment;
+		// Hack to maintain ADJUST_PAN flag
+		getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN);
+	}
+	
+	public void updateStatusFragment(StatusFragment fragment) {
+		statusFragment = fragment;
+	}
+
+	public ArrayList<String> getChatList() {
+		if (chatStorage != null) {
+			return chatStorage.getChatList();
+		}
+		return null;
+	}
+	
+	public List<ChatMessage> getChatMessages(String correspondent) {
+		if (chatStorage != null) {
+			return chatStorage.getMessages(correspondent);
+		}
+		return null;
+	}
+	
+	public void removeFromChatList(String sipUri) {
+		if (chatStorage != null) {
+			chatStorage.removeDiscussion(sipUri);
+		}
+	}
+	
+	@Override
+	public void onMessageReceived(LinphoneAddress from, String message) {
+		if (chatStorage != null) {
+			chatStorage.saveMessage(from.asStringUriOnly(), "", message);
+		}
+		
+		Log.d("Message received from " + from + ": " + message);
+		if (messageListenerFragment != null && messageListenerFragment.isVisible()) {
+			((ChatFragment) messageListenerFragment).onMessageReceived(from, message);
+		}
+		
+		if (LinphoneService.isReady()) {
+			LinphoneUtils.findUriPictureOfContactAndSetDisplayName(from, getContentResolver());
+			LinphoneService.instance().displayMessageNotification(from.getDisplayName(), message);
+		}
+	}
+	
+	public void onMessageSent(String to, String message) {
+		if (chatStorage != null) {
+			chatStorage.saveMessage("", to, message);
+		}
+		Log.d("Message sent to " + to + ": " + message);
+	}
+
+	@Override
+	public void onRegistrationStateChanged(RegistrationState state) {
+		if (statusFragment != null) {
+			statusFragment.registrationStateChanged(state);
+		}
+	}
+	
+	private void displayMissedCalls(final int missedCallsCount) {
+		mHandler.post(new Runnable() {
+			@Override
+			public void run() {
+				if (missedCallsCount > 0) {
+					missedCalls.setText(missedCallsCount + "");
+					missedCalls.setVisibility(View.VISIBLE);
+				} else {
+					missedCalls.setVisibility(View.GONE);
+				}
+			}
+		});
+	}
+
+	@Override
+	public void onCallStateChanged(LinphoneCall call, State state,
+			String message) {
+		if (state == State.IncomingReceived) {
+			Intent intent = new Intent(this, IncomingCallActivity.class);
+			startActivity(intent);
+		} else if (state == State.OutgoingInit) {
+			if (call.getCurrentParamsCopy().getVideoEnabled()) {
+				startVideoActivity(call);
+			} else {
+				startIncallActivity(call);
+			}
+		} else if (state == State.CallEnd || state == State.Error || state == State.CallReleased) {
+			resetClassicMenuLayoutAndGoBackToCallIfStillRunning();
+		}
+		
+		int missedCalls = LinphoneManager.getLc().getMissedCallsCount();
+		displayMissedCalls(missedCalls);
+	}
+
+	@Override
+	public void setAddressAndGoToDialer(String number, String name, Uri photo) {
+		Bundle extras = new Bundle();
+		extras.putString("SipUri", number);
+		extras.putString("DisplayName", name);
+		extras.putString("Photo", photo == null ? null : photo.toString());
+		changeCurrentFragment(FragmentsAvailable.DIALER, extras);
+	}
+	
+	public void setAddressAndGoToDialer(String number) {
+		Bundle extras = new Bundle();
+		extras.putString("SipUri", number);
+		changeCurrentFragment(FragmentsAvailable.DIALER, extras);
+	}
+
+	@Override
+	public void goToDialer() {
+		changeCurrentFragment(FragmentsAvailable.DIALER, null);
+	}
+
+	public void onRegistrationStateChanged(RegistrationState state,
+			String message) {
+		if (statusFragment != null) {
+			statusFragment.registrationStateChanged(state);
+		}
+	}
+
+	public void startVideoActivity(LinphoneCall currentCall) {
+		Intent intent = new Intent(this, InCallActivity.class);
+		intent.putExtra("VideoEnabled", true);
+		startActivityForResult(intent, callActivity);
+	}
+	
+	public void startIncallActivity(LinphoneCall currentCall) {
+		Intent intent = new Intent(this, InCallActivity.class);
+		intent.putExtra("VideoEnabled", false);
+		startActivityForResult(intent, callActivity);
+	}
+
+	public void showPreferenceErrorDialog(String message) {
+		
+	}
+	
+	private void initInCallMenuLayout() {
+		isInCallLayout = true;
+		selectMenu(FragmentsAvailable.DIALER);
+		((DialerFragment) dialerFragment).resetLayout();
+	}
+	
+	public void resetClassicMenuLayoutAndGoBackToCallIfStillRunning() {
+		mHandler.post(new Runnable() {
+			@Override
+			public void run() {
+				isInCallLayout = false;
+				((DialerFragment) dialerFragment).resetLayout();
+				
+				if (LinphoneManager.getLc().getCallsNb() > 0) {
+					LinphoneCall call = LinphoneManager.getLc().getCalls()[0];
+					if (call.getCurrentParamsCopy().getVideoEnabled()) {
+						startVideoActivity(call);
+					} else {
+						startIncallActivity(call);
+					}
+				}
+			}
+		});
+	}
+	
+	public boolean isInCallLayout() {
+		return isInCallLayout;
+	}
 	
 	@Override
 	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-		switch (requestCode) {
-		case FIRST_LOGIN_ACTIVITY:
-			if (resultCode == RESULT_OK) {
-//				Toast.makeText(this, getString(R.string.ec_calibration_launch_message), Toast.LENGTH_LONG).show();
-//				try {
-//					LinphoneManager.getInstance().startEcCalibration(new EcCalibrationListener() {
-//						public void onEcCalibrationStatus(EcCalibratorStatus status, int delayMs) {
-//							PreferenceManager.getDefaultSharedPreferences(LinphoneActivity.this)
-//							.edit().putBoolean(
-//									getString(R.string.pref_echo_canceller_calibration_key),
-//									status == EcCalibratorStatus.Done).commit();
-//						}
-//					});
-//				} catch (LinphoneCoreException e) {
-//					Log.e(e, "Unable to calibrate EC");
-//				}
-				fillTabHost();
-			} else {
+		if (resultCode == Activity.RESULT_FIRST_USER && requestCode == SETTINGS_ACTIVITY) {
+			if (data.getExtras().getBoolean("Exit", false)) {
 				finish();
 				stopService(new Intent(ACTION_MAIN).setClass(this, LinphoneService.class));
-			}
-			break;
-		default:
-			break;
-		}
-		
-		super.onActivityResult(requestCode, resultCode, data);
-	}
-
-
-	private synchronized void fillTabHost() {
-		if (((TabWidget) findViewById(android.R.id.tabs)).getChildCount() != 0) return;
-
-	    startActivityInTab("history",
-	    		new Intent().setClass(this, HistoryActivity.class),
-	    		R.string.tab_history, R.drawable.history_orange);
-
-	    
-	    startActivityInTab(DIALER_TAB,
-	    		new Intent().setClass(this, DialerActivity.class).setData(getIntent().getData()),
-	    		R.string.tab_dialer, R.drawable.dialer_orange);
-	    
-
-	    startActivityInTab("contact",
-	    		new Intent().setClass(this, Version.sdkAboveOrEqual(5) ?
-	    		ContactPickerActivityNew.class : ContactPickerActivityOld.class),
-	    		R.string.tab_contact, R.drawable.contact_orange);
-
-
-	    selectDialerTab();
-	}
-
-	@Override
-	protected void onNewIntent(Intent intent) {
-		super.onNewIntent(intent);
-		if (intent.getData() == null) {
-			Log.i("LinphoneActivity received an intent without data");
-			// Ex: incoming call received
-			if (LinphoneManager.getLc().getCallsNb() == 0) return;
-			if(LinphoneManager.getLc().isInComingInvitePending()) {
-				startIncomingCallActivity();
 			} else {
-				LinphoneCall currentCall = LinphoneManager.getLc().getCurrentCall();
-				if (currentCall == null)
-					return;
-				
-				if (currentCall.getCurrentParamsCopy().getVideoEnabled()) {
-					currentCall.enableCamera(true);
-					startVideoActivity(currentCall, 0);
-				}
-				else
-					startIncallActivity();
+				FragmentsAvailable newFragment = (FragmentsAvailable) data.getExtras().getSerializable("FragmentToDisplay");
+				changeCurrentFragment(newFragment, null);
+				selectMenu(newFragment);
 			}
-			return;
 		}
-
-		Log.i("LinphoneActivity received an intent with data");
-		// Ex: calling from native phone
-		if (DialerActivity.instance() != null) {
-			DialerActivity.instance().newOutgoingCall(intent);
-		} else {
-			Toast.makeText(this, getString(R.string.dialer_null_on_new_intent), Toast.LENGTH_LONG).show();
+		else if (requestCode == callActivity) {
+			if (LinphoneManager.getLc().getCallsNb() > 0) {
+				initInCallMenuLayout(); 
+			} else {
+				resetClassicMenuLayoutAndGoBackToCallIfStillRunning();
+			}
 		}
+		super.onActivityResult(resultCode, requestCode, data);
+	}
+	
+	@Override
+	protected void onResume() {
+		super.onResume();
+		
+		chatStorage = new ChatStorage(this);
 	}
 	
 	@Override
 	protected void onPause() {
 		super.onPause();
-		if  (isFinishing())  {
-			//restore audio settings
-			LinphoneManager.removeListener(this);
-			LinphoneManager.stopProximitySensorForActivity(this);
-			instance = null;
-		}
-	}
-
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-		// Inflate the currently selected menu XML resource.
-		MenuInflater inflater = getMenuInflater();
-		inflater.inflate(R.menu.linphone_activity_menu, menu);
-		menu.findItem(R.id.menu_settings).setVisible(useMenuSettings);
-		menu.findItem(R.id.menu_about).setVisible(useMenuAbout);
-		return true;
-	}
-	
-	@Override
-	public boolean onPrepareOptionsMenu(Menu menu) {
-		LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
-		if (lc == null)
-			return true;
-		// hide settings menu when in call
-		// otherwise, exiting the 'setting' menu will cause exosip deletion/recreation...
-		menu.findItem(R.id.menu_settings).setVisible(!lc.isIncall());
 		
-		return super.onPrepareOptionsMenu(menu);
-	}
-
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item) {
-		int id = item.getItemId();
-		if (id == R.id.menu_settings) {
-			startprefActivity();
-			return true;
-		}
-		else if (id == R.id.menu_exit) {
-			finish();
-			stopService(new Intent(ACTION_MAIN)
-				.setClass(this, LinphoneService.class));
-		}
-		else if (id == R.id.menu_about) {
-			startActivity(new Intent(ACTION_MAIN)
-				.setClass(this, AboutActivity.class));
-		}
-		else {
-			Log.e("Unknown menu item [",item,"]");
-		}
-
-		return false;
-	}
-
-	void startprefActivity() {
-		Intent intent = new Intent(ACTION_MAIN);
-		intent.setClass(this, LinphonePreferencesActivity.class);
-		startActivity(intent);
-	}
-
-
-	void showPreferenceErrorDialog(String message) {
-		if (!useMenuSettings) {
-			Toast.makeText(this, message, Toast.LENGTH_LONG);
-		} else {
-			AlertDialog.Builder builder = new AlertDialog.Builder(this)
-			.setMessage(String.format(getString(R.string.config_error), message))
-			.setCancelable(false)
-			.setPositiveButton(getString(R.string.yes), new DialogInterface.OnClickListener() {
-				public void onClick(DialogInterface dialog, int id) {
-					startprefActivity();
-				}
-			})
-			.setNegativeButton(getString(R.string.no), new DialogInterface.OnClickListener() {
-				public void onClick(DialogInterface dialog, int id) {
-					dialog.cancel();
-				}
-			});
-
-			builder.create().show();
-		}
-	}
-
-	public void onRegistrationStateChanged(RegistrationState state,
-			String message) {
-		
-		if (FirstLoginActivity.instance != null) {
-			FirstLoginActivity.instance.onRegistrationStateChanged(state);
-		}
-	}
-	
-	
-	
-	/***** Check Account *******/
-	private boolean checkDefined(SharedPreferences pref, int ... keys) {
-		for (int key : keys) {
-			String conf = pref.getString(getString(key), null);
-			if (conf == null || "".equals(conf))
-				return false;
-		}
-		return true;
-	}
-
-	private void onFirstLaunch() {
-		AlertDialog.Builder builder = new AlertDialog.Builder(this);
-		TextView lDialogTextView = new TextView(this);
-		lDialogTextView.setAutoLinkMask(0x0f/*all*/);
-		lDialogTextView.setPadding(10, 10, 10, 10);
-
-		lDialogTextView.setText(Html.fromHtml(getString(R.string.first_launch_message)));
-
-		builder.setCustomTitle(lDialogTextView)
-		.setCancelable(false)
-		.setPositiveButton(getString(R.string.cont), new DialogInterface.OnClickListener() {
-			public void onClick(DialogInterface dialog, int id) {
-				LinphoneManager.getInstance().initializePayloads();
-				startprefActivity();
-				checkAccount = false;
-			}
-		});
-
-		builder.create().show();
-	}
-
-	private void onBadSettings(final SharedPreferences pref) {
-		AlertDialog.Builder builder = new AlertDialog.Builder(this);
-		TextView lDialogTextView = new TextView(this);
-		lDialogTextView.setAutoLinkMask(0x0f/*all*/);
-		lDialogTextView.setPadding(10, 10, 10, 10);
-
-		lDialogTextView.setText(Html.fromHtml(getString(R.string.initial_config_error)));
-
-		builder.setCustomTitle(lDialogTextView)
-		.setCancelable(false)
-		.setPositiveButton(getString(R.string.yes), new DialogInterface.OnClickListener() {
-			public void onClick(DialogInterface dialog, int id) {
-				startprefActivity();
-				checkAccount = false;
-			}
-		}).setNeutralButton(getString(R.string.no), new DialogInterface.OnClickListener() {
-			public void onClick(DialogInterface dialog, int id) {
-				dialog.cancel();
-				checkAccount = false;
-			}
-		}).setNegativeButton(getString(R.string.never_remind), new DialogInterface.OnClickListener() {
-			public void onClick(DialogInterface dialog, int id) {
-				pref.edit().putBoolean(PREF_CHECK_CONFIG, true).commit();
-				dialog.cancel();
-				checkAccount = false;
-			}
-		});
-
-		builder.create().show();
-	}
-
-	public void setAddressAndGoToDialer(String number, String name, Uri photo) {
-		DialerActivity.instance().setContactAddress(number, name, photo);
-		selectDialerTab();
-	}
-
-	private void selectDialerTab() {
-		getTabHost().setCurrentTabByTag(DIALER_TAB);
-	}
-
-	
-	private void startActivityInTab(String tag, Intent intent, int indicatorId, int drawableId) {
-	    Drawable tabDrawable = getResources().getDrawable(drawableId);
-	    TabSpec spec = getTabHost().newTabSpec(tag)
-	    		.setIndicator(getString(indicatorId), tabDrawable)
-	    		.setContent(intent);
-	    getTabHost().addTab(spec);
-	}
-
-
-	// Do not call if video activity already launched as it would cause a pause() of the launched one
-	// and a race condition with capture surfaceview leading to a crash
-	public void startVideoActivity(final LinphoneCall call, int delay) {
-		if (VideoCallActivity.launched || call == null) {
-			return;
-		}
-		mHandler.postDelayed(new Runnable() {
-			public void run() {
-				if (VideoCallActivity.launched) return;
-				startOrientationSensor();
-				//LinphoneManager.getInstance().enableCamera(call, true);
-				startActivityForResult(new Intent().setClass(
-						LinphoneActivity.this,
-						VideoCallActivity.class),
-						video_activity);
-				// Avoid two consecutive runs to enter the previous block
-				VideoCallActivity.launched = true;
-				}
-		}, delay);
-		LinphoneManager.getInstance().routeAudioToSpeaker();
-	}
-
-	public synchronized void startIncallActivity() {
-		if (IncallActivity.instance() != null && IncallActivity.instance().isActive()) {
-			return;
-		}
-		mHandler.post(new Runnable() {
-			public void run() {
-				if (IncallActivity.active) return;
-				Intent intent = new Intent().setClass(LinphoneActivity.this, IncallActivity.class);
-				startActivityForResult(intent, incall_activity);
-			}
-		});
-	}
-
-	public void startIncomingCallActivity() {
-		Intent intent = new Intent().setClass(this, IncomingCallActivity.class);
-		startActivityForResult(intent, INCOMING_CALL_ACTIVITY);
-	}
-
-	/**
-	 * Register a sensor to track phoneOrientation changes
-	 */
-	private synchronized void startOrientationSensor() {
-		if (mOrientationHelper == null) {
-			mOrientationHelper = new LocalOrientationEventListener(this);
-		}
-		mOrientationHelper.enable();
-	}
-
-	private int mAlwaysChangingPhoneAngle = -1;
-	private class LocalOrientationEventListener extends OrientationEventListener {
-		public LocalOrientationEventListener(Context context) {
-			super(context);
-		}
-		@Override
-		public void onOrientationChanged(final int o) {
-			if (o == OrientationEventListener.ORIENTATION_UNKNOWN) return;
-
-			int degrees=270;
-			if (o < 45 || o >315) degrees=0;
-			else if (o<135) degrees=90;
-			else if (o<225) degrees=180;
-
-			if (mAlwaysChangingPhoneAngle == degrees) return;
-			mAlwaysChangingPhoneAngle = degrees;
-
-			Log.d("Phone orientation changed to ", degrees);
-			int rotation = (360 - degrees) % 360;
-			LinphoneCore lc=LinphoneManager.getLcIfManagerNotDestroyedOrNull();
-			if (lc!=null){
-				lc.setDeviceRotation(rotation);
-				LinphoneCall currentCall = lc.getCurrentCall();
-				if (currentCall != null && currentCall.cameraEnabled() && currentCall.getCurrentParamsCopy().getVideoEnabled()) {
-					lc.updateCall(currentCall, null);
-				}
-			}
-		}
-	}
-	
-	@Override
-	public void onCallStateChanged(LinphoneCall call, State state,
-			String message) {
-		LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
-		if (lc==null) {
-			/* we are certainly exiting, ignore then.*/
-			return;
-		}
-
-		if (state==State.IncomingReceived) {
-			if (call.getCurrentParamsCopy().getVideoEnabled()) 
-				startOrientationSensor();
-			startIncomingCallActivity();
-		}
-		if (state == State.OutgoingInit) {
-			if (call.getCurrentParamsCopy().getVideoEnabled()) {
-				startOrientationSensor();
-				startVideoActivity(call, 0);
-			} else {
-				startIncallActivity();
-			}
-		}
-
-		if (state == LinphoneCall.State.StreamsRunning && Version.isVideoCapable() && !call.isInConference()) {
-			// call.cameraEnabled() contains the wish of the user
-			// set in LinphoneManager#onCallStateChanged(OutgoingInit||IncomingReceived)
-			boolean videoEnabled = call.getCurrentParamsCopy().getVideoEnabled();
-			if (videoEnabled) {
-				finishActivity(incall_activity);
-				startVideoActivity(call, 0);
-			} else {
-				finishActivity(video_activity);
-				startIncallActivity();
-			}
-		}
-
-		if (state == LinphoneCall.State.CallUpdatedByRemote && Version.isVideoCapable()) {
-			if (VideoCallActivity.launched && !call.getCurrentParamsCopy().getVideoEnabled()) {
-				finishActivity(video_activity);
-				startIncallActivity();
-			}
-		}
-		
-		if (state == LinphoneCall.State.PausedByRemote) {
-			finishActivity(video_activity);
-			startIncallActivity();
-		}
-
-		if (state==State.Error){
-			showToast(R.string.call_error, message);
-		}
-		if (state==State.Error || state==State.CallEnd) {
-			finishActivity(INCOMING_CALL_ACTIVITY);
-			if (lc.getCallsNb() == 0){
-				exitIncallActivity();
-				// Might be possible to optimize by disabling it before
-				if (mOrientationHelper != null) mOrientationHelper.disable();
-			}
-			if (ConferenceDetailsActivity.active && lc.getConferenceSize() == 0) {
-				finishActivity(conferenceDetailsActivity);
-			}
-		}
-	}
-	
-	private void showToast(int id, String txt) {
-		final String msg = String.format(getString(id), txt);
-		mHandler.post(new Runnable() {
-			public void run() {
-				Toast.makeText(LinphoneActivity.this, msg, Toast.LENGTH_LONG).show();
-			}
-		});
-	}
-
-
-
-	private void exitIncallActivity() {
-		setVolumeControlStream(AudioManager.USE_DEFAULT_STREAM_TYPE);
-	}
-
-
-	@Override
-	protected void onResume() {
-		super.onResume();
-		LinphoneCall pendingCall = LinphoneManager.getInstance().getPendingIncomingCall();
-		if (pendingCall != null) {
-			startIncomingCallActivity();
-		} 
-	}
-
-	@Override
-	public void goToDialer() {
-		selectDialerTab();
-	}
-
-	public void startConferenceDetailsActivity() {
-		startActivityForResult(new Intent().setClass(this, ConferenceDetailsActivity.class), conferenceDetailsActivity);
+		chatStorage.close();
 	}
 }
 
 interface ContactPicked {
 	void setAddressAndGoToDialer(String number, String name, Uri photo);
 	void goToDialer();
-}
+}
\ No newline at end of file
diff --git a/src/org/linphone/LinphoneLauncherActivity.java b/src/org/linphone/LinphoneLauncherActivity.java
index 36537a443..17055dbd1 100644
--- a/src/org/linphone/LinphoneLauncherActivity.java
+++ b/src/org/linphone/LinphoneLauncherActivity.java
@@ -1,5 +1,5 @@
 /*
-LinphoneLauncher.java
+LinphoneLauncherActivity.java
 Copyright (C) 2011  Belledonne Communications, Grenoble, France
 
 This program is free software; you can redistribute it and/or
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 5ad0303b0..62f226aef 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -197,6 +197,7 @@ public final class LinphoneManager implements LinphoneCoreListener {
 	private static void sRouteAudioToSpeakerHelperHelper(boolean speakerOn) {
 		getInstance().routeAudioToSpeakerHelperHelper(speakerOn);
 	}
+	@SuppressWarnings("deprecation")
 	private void routeAudioToSpeakerHelperHelper(boolean speakerOn) {
 		boolean different = isSpeakerOn() ^ speakerOn;
 		if (!different) {
@@ -293,8 +294,7 @@ public final class LinphoneManager implements LinphoneCoreListener {
 		return getInstance().mLc;
 	}
 
-
-	
+	@SuppressWarnings("deprecation")
 	public boolean isSpeakerOn() {
 		if (Hacks.needRoutingAPI() || sLPref.useAudioRoutingAPIHack()) {
 			return mAudioManager.getRouting(MODE_NORMAL) == ROUTE_SPEAKER;
@@ -902,8 +902,15 @@ public final class LinphoneManager implements LinphoneCoreListener {
 	public void show(LinphoneCore lc) {}
 	public void newSubscriptionRequest(LinphoneCore lc,LinphoneFriend lf,String url) {}
 	public void notifyPresenceReceived(LinphoneCore lc, LinphoneFriend lf) {}
+	
 	public void textReceived(LinphoneCore lc, LinphoneChatRoom cr,
-			LinphoneAddress from, String message) {}
+			LinphoneAddress from, String message) {
+		//TODO : Remove
+		Log.e("LinphoneManager, Message received from " + from + ": " + message);
+		for (LinphoneSimpleListener listener : getSimpleListeners(LinphoneActivity.class)) {
+			((LinphoneActivity) listener).onMessageReceived(from, message);
+		}
+	}
 
 
 	public String getLastLcStatusMessage() {
@@ -967,6 +974,7 @@ public final class LinphoneManager implements LinphoneCoreListener {
 
 		if (state == IncomingReceived) {
 			// Brighten screen for at least 10 seconds
+			@SuppressWarnings("deprecation")
 			WakeLock wl = mPowerManager.newWakeLock(
 					PowerManager.ACQUIRE_CAUSES_WAKEUP
 					|PowerManager.ON_AFTER_RELEASE
@@ -1216,13 +1224,7 @@ public final class LinphoneManager implements LinphoneCoreListener {
 	}
 
 	public static String extractIncomingRemoteName(Resources r, LinphoneAddress linphoneAddress) {
-		if (!r.getBoolean(R.bool.show_full_remote_address_on_incoming_call))
-			return extractADisplayName(r, linphoneAddress);
-
-		if (linphoneAddress != null)
-			return linphoneAddress.asStringUriOnly();
-
-		return r.getString(R.string.unknown_incoming_call_name);
+		return extractADisplayName(r, linphoneAddress);
 	}
 
 	public void adjustSoftwareVolume(int i) {
@@ -1382,6 +1384,9 @@ public final class LinphoneManager implements LinphoneCoreListener {
 		public void onRegistrationStateChanged(RegistrationState state,
 				String message) {
 			if (serviceListener != null) serviceListener.onRegistrationStateChanged(state, message);
+			for (LinphoneOnRegistrationStateChangedListener listener : getSimpleListeners(LinphoneActivity.class)) {
+				listener.onRegistrationStateChanged(state);
+			}
 		}
 
 		public void onRingerPlayerCreated(MediaPlayer mRingerPlayer) {
diff --git a/src/org/linphone/LinphonePreferencesActivity.java b/src/org/linphone/LinphonePreferencesActivity.java
index f15b19ded..78500502e 100644
--- a/src/org/linphone/LinphonePreferencesActivity.java
+++ b/src/org/linphone/LinphonePreferencesActivity.java
@@ -1,6 +1,7 @@
+package org.linphone;
 /*
 LinphonePreferencesActivity.java
-Copyright (C) 2010  Belledonne Communications, Grenoble, France
+Copyright (C) 2012  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
@@ -15,856 +16,98 @@ 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 static org.linphone.R.string.ec_calibrating;
-import static org.linphone.R.string.pref_codec_amr_key;
-import static org.linphone.R.string.pref_codec_amrwb_key;
-import static org.linphone.R.string.pref_codec_ilbc_key;
-import static org.linphone.R.string.pref_codec_speex16_key;
-import static org.linphone.R.string.pref_echo_cancellation_key;
-import static org.linphone.R.string.pref_echo_canceller_calibration_key;
-import static org.linphone.R.string.pref_echo_limiter_key;
-import static org.linphone.R.string.pref_media_encryption_key;
-import static org.linphone.R.string.pref_video_enable_key;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.linphone.LinphoneManager.EcCalibrationListener;
-import org.linphone.LinphoneManager.LinphoneConfigException;
-import org.linphone.core.LinphoneCore;
-import org.linphone.core.LinphoneCore.EcCalibratorStatus;
-import org.linphone.core.LinphoneCore.MediaEncryption;
-import org.linphone.core.LinphoneCoreException;
-import org.linphone.core.Log;
-import org.linphone.mediastream.Version;
-import org.linphone.mediastream.video.capture.hwconf.AndroidCameraConfiguration;
-import org.linphone.mediastream.video.capture.hwconf.Hacks;
-
-import android.app.AlertDialog;
-import android.app.Dialog;
+*/
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.os.Handler;
-import android.preference.CheckBoxPreference;
-import android.preference.ListPreference;
-import android.preference.Preference;
-import android.preference.Preference.OnPreferenceChangeListener;
-import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceActivity;
-import android.preference.PreferenceCategory;
-import android.preference.PreferenceScreen;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
-import de.timroes.axmlrpc.XMLRPCCallback;
-import de.timroes.axmlrpc.XMLRPCClient;
-import de.timroes.axmlrpc.XMLRPCException;
-import de.timroes.axmlrpc.XMLRPCServerException;
 
-public class LinphonePreferencesActivity extends PreferenceActivity implements EcCalibrationListener {
-	private Handler mHandler = new Handler();
-	private CheckBoxPreference ecCalibratePref;
-	private CheckBoxPreference elPref;
-	private CheckBoxPreference ecPref;
-	private ListPreference mencPref;
-	private int nbAccounts = 1;
-	
-	// Wizard fields
-	private boolean usernameOk = false;
-	private boolean passwordOk = false;
-	private boolean emailOk = false;
-	private AlertDialog wizardDialog;
-	private Button createAccount;
-	private TextView errorMessage;
-	private PreferenceCategory accounts;
-	private String username;
-	
-	private static final int ADD_SIP_ACCOUNT = 0x666;
-	private static final int WIZARD_ID = 0x667;
-	private static final int CONFIRM_ID = 0x668;
-	private static final int ACCOUNTS_SETTINGS_ID = 0;
-	private static final int ADD_ACCOUNT_SETTINGS_ID = 1;
-	private static final int WIZARD_SETTINGS_ID = 2;
-	private static final int CAMERA_SETTINGS_ID = 6;
-
-	private SharedPreferences prefs() {
-		return getPreferenceManager().getSharedPreferences();
-	}
-
-	private CheckBoxPreference findCheckbox(int key) {
-		return (CheckBoxPreference) findPreference(getString(key));
-	}
-
-	private void detectAudioCodec(int id, String mime, int rate, boolean hide) {
-		boolean enable = LinphoneService.isReady() && LinphoneManager.getLc().findPayloadType(mime, rate)!=null;
-		Preference cb = findPreference(id);
-		cb.setEnabled(enable);
-		if (hide && !enable) {
-			cb.setLayoutResource(R.layout.hidden);
-		}
-	}
-
-	private void detectVideoCodec(int id, String mime) {
-		findPreference(id).setEnabled(LinphoneManager.getInstance().detectVideoCodec(mime));
-	}
-
-	private void createDynamicAccountsPreferences() {
-		accounts = (PreferenceCategory) getPreferenceScreen().getPreference(ACCOUNTS_SETTINGS_ID);
-		accounts.removeAll();
-		
-		// Get already configured extra accounts
-		SharedPreferences prefs = getPreferenceManager().getSharedPreferences();
-		nbAccounts = prefs.getInt(getString(R.string.pref_extra_accounts), 0);
-		for (int i = 0; i < nbAccounts; i++) {
-			// For each, add menus to configure it
-			addExtraAccountPreferencesButton(accounts, i, false);
-		}
-	}
-	
-	private void createAddAccountButton() {
-		Preference addAccount = (Preference) getPreferenceScreen().getPreference(ADD_ACCOUNT_SETTINGS_ID);
-		addAccount.setOnPreferenceClickListener(new OnPreferenceClickListener() {
-	        public boolean onPreferenceClick(Preference preference) {
-	        	addExtraAccountPreferencesButton(accounts, nbAccounts, true);
-	        	Intent i = new Intent();
-				i.putExtra("Account",nbAccounts);
-	        	nbAccounts++;
-				i.setClass(LinphonePreferencesActivity.this, LinphonePreferencesSIPAccountActivity.class);
-				startActivityForResult(i, ADD_SIP_ACCOUNT);
-	        	return true;
-	        }
-        });
-	}
-	
-	public int getNbAccountsExtra() {
-		return nbAccounts;
-	}
-	
-	private void addExtraAccountPreferencesButton(PreferenceCategory parent, final int n, boolean isNewAccount) {
-		SharedPreferences prefs = getPreferenceManager().getSharedPreferences();
-		if (isNewAccount) {
-			SharedPreferences.Editor editor = prefs.edit();
-			editor.putInt(getString(R.string.pref_extra_accounts), n+1);
-			editor.commit();
-		}
-		
-		Preference me = new Preference(LinphonePreferencesActivity.this);
-		String keyUsername = getString(R.string.pref_username_key);
-		String keyDomain = getString(R.string.pref_domain_key);
-		if (n > 0) {
-			keyUsername += n + "";
-			keyDomain += n + "";
-		}
-		if (prefs.getString(keyUsername, null) == null) {
-			me.setTitle(getString(R.string.pref_sipaccount));
-		} else {
-			me.setTitle(prefs.getString(keyUsername, "") + "@" + prefs.getString(keyDomain, ""));
-		}
-		
-		me.setOnPreferenceClickListener(new OnPreferenceClickListener() 
-		{
-			public boolean onPreferenceClick(Preference preference) {
-				Intent i = new Intent();
-				i.putExtra("Account", n);
-				i.setClass(LinphonePreferencesActivity.this, LinphonePreferencesSIPAccountActivity.class);
-				startActivityForResult(i, ADD_SIP_ACCOUNT);
-				return false;
-			}
-		});
-		parent.addPreference(me);
-	}
-	
-	private void fillLinphoneAccount(int i, String username, String password, boolean createdByWizard) {
-		SharedPreferences prefs = getPreferenceManager().getSharedPreferences();
-		SharedPreferences.Editor editor = prefs.edit();
-		
-		editor.putString(getString(R.string.pref_username_key) + i, username);
-		editor.putString(getString(R.string.pref_passwd_key) + i, password);
-		editor.putString(getString(R.string.pref_domain_key) + i, "sip.linphone.org");
-		editor.putString(getString(R.string.pref_proxy_key) + i, "");
-		editor.putBoolean(getString(R.string.pref_wizard_key) + i, createdByWizard);
-		editor.putBoolean(getString(R.string.pref_activated_key) + i, false);
-		editor.putBoolean(getString(R.string.pref_enable_outbound_proxy_key) + i, false);
-		
-		editor.commit();
-	}
-	
-	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-		super.onActivityResult(requestCode, resultCode, data);
-		
-		if (requestCode == ADD_SIP_ACCOUNT) {
-			//Verify if last created account is filled
-			SharedPreferences prefs = getPreferenceManager().getSharedPreferences();
-			int n = prefs.getInt(getString(R.string.pref_extra_accounts), 1);
-			String keyUsername = getString(R.string.pref_username_key) + (n-1 == 0 ? "" : Integer.toString(n-1));
-			
-			if (prefs.getString(keyUsername, "").equals("")) {
-				//If not, we suppress it to not display a blank field
-				SharedPreferences.Editor editor = prefs.edit();
-				editor.putInt(getString(R.string.pref_extra_accounts), n-1);
-				editor.commit();
-			}
-			
-			createDynamicAccountsPreferences();
-		}
-	}
-	
-	private void addWizardPreferenceButton() {
-		Preference wizard = (Preference) getPreferenceScreen().getPreference(WIZARD_SETTINGS_ID);
-		wizard.setOnPreferenceClickListener(new OnPreferenceClickListener() {
-	        public boolean onPreferenceClick(Preference preference) {
-	        	showDialog(WIZARD_ID);
-	        	return true;
-	        }
-        });
-	}
-	
-	protected Dialog onCreateDialog (int id) {
-		if (id == WIZARD_ID) {
-			AlertDialog.Builder builder = new AlertDialog.Builder(LinphonePreferencesActivity.this);
-	    	LayoutInflater inflater = LayoutInflater.from(LinphonePreferencesActivity.this);
-	    	View v = inflater.inflate(R.layout.wizard, null);
-	    	builder.setView(v);
-	    	
-	    	final EditText username = (EditText) v.findViewById(R.id.wizardUsername);
-	    	ImageView usernameOkIV = (ImageView) v.findViewById(R.id.wizardUsernameOk);
-	    	addXMLRPCUsernameHandler(username, usernameOkIV);
-
-	    	final EditText password = (EditText) v.findViewById(R.id.wizardPassword);
-	    	EditText passwordConfirm = (EditText) v.findViewById(R.id.wizardPasswordConfirm);
-	    	ImageView passwordOkIV = (ImageView) v.findViewById(R.id.wizardPasswordOk);
-	    	addXMLRPCPasswordHandler(password, passwordConfirm, passwordOkIV);
-
-	    	final EditText email = (EditText) v.findViewById(R.id.wizardEmail);
-	    	ImageView emailOkIV = (ImageView) v.findViewById(R.id.wizardEmailOk);
-	    	addXMLRPCEmailHandler(email, emailOkIV);
-
-	    	errorMessage = (TextView) v.findViewById(R.id.wizardErrorMessage);
-	    	
-	    	Button cancel = (Button) v.findViewById(R.id.wizardCancel);
-	    	cancel.setOnClickListener(new OnClickListener() {
-				public void onClick(View v) {
-					wizardDialog.dismiss();
-				}
-	    	});
-	    	
-	    	createAccount = (Button) v.findViewById(R.id.wizardCreateAccount);
-	    	createAccount.setOnClickListener(new OnClickListener() {
-				public void onClick(View v) {
-					createAccount(username.getText().toString(), password.getText().toString(), email.getText().toString(), false);
-				}
-	    	});
-			createAccount.setEnabled(false);
-	    	
-	    	builder.setTitle(getString(R.string.wizard_title));
-	    	wizardDialog = builder.create();
-	    	return wizardDialog;
-		}
-		else if (id == CONFIRM_ID) {
-			AlertDialog.Builder builder = new AlertDialog.Builder(LinphonePreferencesActivity.this);
-			builder.setTitle(R.string.wizard_confirmation);
-			
-			final LayoutInflater inflater = LayoutInflater.from(LinphonePreferencesActivity.this);
-	    	View v = inflater.inflate(R.layout.wizard_confirm, null);
-	    	builder.setView(v);
-	    	
-	    	Button check = (Button) v.findViewById(R.id.wizardCheckAccount);
-	    	check.setOnClickListener(new OnClickListener() {
-				public void onClick(View v) {
-					wizardDialog.dismiss();
-					if (isAccountVerified(username)) {
-						SharedPreferences prefs = getPreferenceManager().getSharedPreferences();
-						SharedPreferences.Editor editor = prefs.edit();
-						editor.putBoolean(getString(R.string.pref_activated_key) + (nbAccounts - 1), true);
-						editor.commit();
-					} else {
-						showDialog(CONFIRM_ID);
-					}
-				}
-			});
-	    	
-	    	Button cancel = (Button) v.findViewById(R.id.wizardCancel);
-	    	cancel.setOnClickListener(new OnClickListener() {
-				public void onClick(View v) {
-					wizardDialog.dismiss();
-				}
-			});
-	    	
-			wizardDialog = builder.create();
-			return wizardDialog;
-		}
-		return null;
-	}
-	
-	private boolean isUsernameCorrect(String username) {
-		return username.matches("^[a-zA-Z]+[a-zA-Z0-9.\\-_]{2,}$");
-	}
-	
-	static boolean isAccountVerified(String username) {
-		try {
-			XMLRPCClient client = new XMLRPCClient(new URL("https://www.linphone.org/wizard.php"));
-		    Object resultO = client.call("check_account_validated", "sip:" + username + "@sip.linphone.org");
-		    Integer result = Integer.parseInt(resultO.toString());
-		    
-		    return result == 1;
-		} catch(Exception ex) {
-
-		}
-		return false;
-	}
-	
-	private void isUsernameRegistred(String username, final ImageView icon) {
-		final Runnable runNotReachable = new Runnable() {
-			public void run() {
-				errorMessage.setText(R.string.wizard_server_unavailable);
-				usernameOk = false;
-				icon.setImageResource(R.drawable.notok);
-				createAccount.setEnabled(usernameOk && passwordOk && emailOk);
-			}
-		};
-		
-		try {
-			XMLRPCClient client = new XMLRPCClient(new URL("https://www.linphone.org/wizard.php"));
-			
-			XMLRPCCallback listener = new XMLRPCCallback() {
-				Runnable runNotOk = new Runnable() {
-    				public void run() {
-    					errorMessage.setText(R.string.wizard_username_unavailable);
-    					usernameOk = false;
-						icon.setImageResource(R.drawable.notok);
-						createAccount.setEnabled(usernameOk && passwordOk && emailOk);
-					}
-	    		};
-	    		
-	    		Runnable runOk = new Runnable() {
-    				public void run() {
-    					errorMessage.setText("");
-    					icon.setImageResource(R.drawable.ok);
-						usernameOk = true;
-						createAccount.setEnabled(usernameOk && passwordOk && emailOk);
-					}
-	    		};
-				
-			    public void onResponse(long id, Object result) {
-			    	int answer = (Integer) result;
-			    	if (answer != 0) {
-			    		runOnUiThread(runNotOk);
-					}
-					else {
-						runOnUiThread(runOk);
-					}
-			    }
-			    
-			    public void onError(long id, XMLRPCException error) {
-			    	runOnUiThread(runNotReachable);
-			    }
-			   
-			    public void onServerError(long id, XMLRPCServerException error) {
-			    	runOnUiThread(runNotReachable);
-			    }
-			};
-
-		    client.callAsync(listener, "check_account", username);
-		} 
-		catch(Exception ex) {
-			runOnUiThread(runNotReachable);
-		}
-	}
-	
-	private boolean isEmailCorrect(String email) {
-		return email.matches("^[a-z0-9]+([_\\.-][a-z0-9]+)*@([a-z0-9]+([\\.-][a-z0-9]+)*)+\\.[a-z]{2,}$");
-	}
-	
-	private boolean isPasswordCorrect(String password) {
-		return password.length() >= 6;
-	}
-	
-	private void createAccount(final String username, final String password, String email, boolean suscribe) {
-		final Runnable runNotReachable = new Runnable() {
-			public void run() {
-				errorMessage.setText(R.string.wizard_server_unavailable);
-			}
-		};
-		
-		try {
-			XMLRPCClient client = new XMLRPCClient(new URL("https://www.linphone.org/wizard.php"));
-			
-			XMLRPCCallback listener = new XMLRPCCallback() {
-				Runnable runNotOk = new Runnable() {
-    				public void run() {
-    					errorMessage.setText(R.string.wizard_failed);
-					}
-	    		};
-	    		
-	    		Runnable runOk = new Runnable() {
-    				public void run() {
-			    		addExtraAccountPreferencesButton(accounts, nbAccounts, true);
-			    		LinphonePreferencesActivity.this.username = username;
-			    		fillLinphoneAccount(nbAccounts, username, password, true);
-			        	nbAccounts++;
-			    		createDynamicAccountsPreferences();
-			    		wizardDialog.dismiss();
-			    		
-			    		showDialog(CONFIRM_ID);
-					}
-	    		};
-	    		
-			    public void onResponse(long id, Object result) {
-			    	int answer = (Integer) result;
-			    	if (answer != 0) {
-			    		runOnUiThread(runNotOk);
-			    	} else {
-			    		runOnUiThread(runOk);
-			    	}
-			    }
-			    
-			    public void onError(long id, XMLRPCException error) {
-			    	runOnUiThread(runNotReachable);
-			    }
-			   
-			    public void onServerError(long id, XMLRPCServerException error) {
-			    	runOnUiThread(runNotReachable);
-			    }
-			};
-
-		    client.callAsync(listener, "create_account", username, password, email, suscribe ? 1 : 0);
-		} 
-		catch(Exception ex) {
-			runOnUiThread(runNotReachable);
-		}
-	}
-	
-	private void addXMLRPCUsernameHandler(final EditText field, final ImageView icon) {
-		field.addTextChangedListener(new TextWatcher() {
-			public void afterTextChanged(Editable arg0) {
-				
-			}
-
-			public void beforeTextChanged(CharSequence arg0, int arg1,
-					int arg2, int arg3) {
-				
-			}
-
-			public void onTextChanged(CharSequence arg0, int arg1, int arg2,
-					int arg3) 
-			{
-				usernameOk = false;
-				if (isUsernameCorrect(field.getText().toString()))
-				{
-					isUsernameRegistred(field.getText().toString(), icon);
-				}
-				else {
-					errorMessage.setText(R.string.wizard_username_incorrect);
-					icon.setImageResource(R.drawable.notok);
-				}
-			}
-		});
-	}
-	
-	private void addXMLRPCEmailHandler(final EditText field, final ImageView icon) {
-		field.addTextChangedListener(new TextWatcher() {
-			public void afterTextChanged(Editable arg0) {
-				
-			}
-
-			public void beforeTextChanged(CharSequence arg0, int arg1,
-					int arg2, int arg3) {
-				
-			}
-
-			public void onTextChanged(CharSequence arg0, int arg1, int arg2,
-					int arg3) 
-			{
-				emailOk = false;
-				if (isEmailCorrect(field.getText().toString())) {
-					icon.setImageResource(R.drawable.ok);
-					emailOk = true;
-					errorMessage.setText("");
-				}
-				else {
-					errorMessage.setText(R.string.wizard_email_incorrect);
-					icon.setImageResource(R.drawable.notok);
-				}
-				createAccount.setEnabled(usernameOk && passwordOk && emailOk);
-			}
-		});
-	}
-	
-	private void addXMLRPCPasswordHandler(final EditText field1, final EditText field2, final ImageView icon) {
-		TextWatcher passwordListener = new TextWatcher() {
-			public void afterTextChanged(Editable arg0) {
-				
-			}
-
-			public void beforeTextChanged(CharSequence arg0, int arg1,
-					int arg2, int arg3) {
-				
-			}
-
-			public void onTextChanged(CharSequence arg0, int arg1, int arg2,
-					int arg3) 
-			{
-				passwordOk = false;
-				if (isPasswordCorrect(field1.getText().toString()) && field1.getText().toString().equals(field2.getText().toString())) {
-					passwordOk = true;
-					icon.setImageResource(R.drawable.ok);
-					errorMessage.setText("");
-				}
-				else {
-					if (isPasswordCorrect(field1.getText().toString())) {
-						errorMessage.setText(R.string.wizard_passwords_unmatched);
-					}
-					else {
-						errorMessage.setText(R.string.wizard_password_incorrect);
-					}
-					icon.setImageResource(R.drawable.notok);
-				}
-				createAccount.setEnabled(usernameOk && passwordOk && emailOk);
-			}
-		};
-		
-		field1.addTextChangedListener(passwordListener);
-		field2.addTextChangedListener(passwordListener);
-	}
-	
-	private void verifiyAccountsActivated() {
-		SharedPreferences prefs = getPreferenceManager().getSharedPreferences();
-		for (int i = 0; i < nbAccounts; i++) {
-			String key = (i == 0 ? "" : Integer.toString(i));
-			boolean createdByWizard = prefs.getBoolean(getString(R.string.pref_wizard_key) + key, false);
-			boolean activated = prefs.getBoolean(getString(R.string.pref_activated_key) + key, true);
-			if (createdByWizard && !activated) {
-				//Check if account has been activated since
-				activated = isAccountVerified(prefs.getString(getString(R.string.pref_username_key) + key, ""));
-				if (activated) {
-					SharedPreferences.Editor editor = prefs.edit();
-					editor.putBoolean(getString(R.string.pref_activated_key) + key, true);
-					editor.commit();
-				} else {
-					showDialog(CONFIRM_ID);
-				}
-			}
-		}
-	}
+/**
+ * @author Sylvain Berfini
+ */
+public class LinphonePreferencesActivity extends PreferenceActivity implements OnClickListener {
+	private ImageView history, contacts, dialer, settings, chat;
+	private TextView missedCalls;
 	
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		// Load the preferences from an XML resource
-		addPreferencesFromResource(R.xml.preferences);
-
-		if (!getResources().getBoolean(R.bool.hide_accounts)) {
-			createDynamicAccountsPreferences();
-			
-			// Accounts have to be displayed to show add account button
-			if (getResources().getBoolean(R.bool.hide_add_account_button)) {
-				Preference addAccount = (Preference) getPreferenceScreen().getPreference(ADD_ACCOUNT_SETTINGS_ID);
-				addAccount.setLayoutResource(R.layout.hidden);
-			} else {
-				createAddAccountButton();
-			}
-		} else {
-			// Hide add account button if accounts are hidden
-			Preference addAccount = (Preference) getPreferenceScreen().getPreference(ADD_ACCOUNT_SETTINGS_ID);
-			addAccount.setLayoutResource(R.layout.hidden);
-			
-			// Hide category
-			PreferenceCategory accounts = (PreferenceCategory) getPreferenceScreen().getPreference(ACCOUNTS_SETTINGS_ID);
-			accounts.removeAll();
-			accounts.setLayoutResource(R.layout.hidden);
-		}
+		// Hack to allow custom view in preferences, in this case the bottom menu
+		setContentView(R.layout.settings);
 		
-		if (getResources().getBoolean(R.bool.hide_wizard)) {
-			Preference wizard = (Preference) getPreferenceScreen().getPreference(WIZARD_SETTINGS_ID);
-			wizard.setLayoutResource(R.layout.hidden);
-		} else {
-			addWizardPreferenceButton();
-			verifiyAccountsActivated();
-		}
+		initButtons();
 		
-		addTransportChecboxesListener();
-		
-		ecCalibratePref = (CheckBoxPreference) findPreference(pref_echo_canceller_calibration_key);
-		ecCalibratePref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
-			public boolean onPreferenceClick(Preference preference) {
-				startEcCalibration();
-				return false;
-			}
-		});
-		ecPref = (CheckBoxPreference) findPreference(pref_echo_cancellation_key);
-		elPref = (CheckBoxPreference) findPreference(pref_echo_limiter_key);
-		mencPref = (ListPreference) findPreference(pref_media_encryption_key);
-
-		boolean fastCpu = Version.isArmv7();
-		if (fastCpu) {
-			detectAudioCodec(pref_codec_ilbc_key, "iLBC", 8000, false);
-			findPreference(pref_codec_speex16_key).setEnabled(true);
-			//findPreference(pref_codec_speex32_key)).setEnabled(enableIlbc);
-		}
-		findPreference(pref_echo_limiter_key).setEnabled(true);
-
-		initializeMediaEncryptionPreferences();
+		int missedCalls = LinphoneManager.getLc().getMissedCallsCount();
+		displayMissedCalls(missedCalls);
+	}
 	
-		detectAudioCodec(pref_codec_amr_key,"AMR", 8000, false);
-        detectAudioCodec(pref_codec_amrwb_key,"AMR-WB", 16000, false);
-		//detectAudioCodec(R.string.pref_codec_silk8_key,"SILK",8000, true);
-		//detectAudioCodec(R.string.pref_codec_silk12_key,"SILK",12000, true);
-		detectAudioCodec(R.string.pref_codec_silk16_key,"SILK",16000, true);
-		detectAudioCodec(R.string.pref_codec_silk24_key,"SILK",24000, true);
-		detectAudioCodec(R.string.pref_codec_g729_key,"G729",8000, true);
+	private void initButtons() {
+		history = (ImageView) findViewById(R.id.history);
+        history.setOnClickListener(this);
+        contacts  = (ImageView) findViewById(R.id.contacts);
+        contacts.setOnClickListener(this);
+        dialer = (ImageView) findViewById(R.id.dialer);
+        dialer.setOnClickListener(this);
+		dialer.setSelected(true);
+        settings = (ImageView) findViewById(R.id.settings);
+        settings.setOnClickListener(this);
+        chat = (ImageView) findViewById(R.id.chat);
+		chat.setOnClickListener(this);
+		missedCalls = (TextView) findViewById(R.id.missedCalls);
 		
-		// No video
-		if (!Version.isVideoCapable()) {
-			uncheckAndDisableCheckbox(pref_video_enable_key);
-		} else if (!AndroidCameraConfiguration.hasFrontCamera()) {
-			uncheckDisableAndHideCheckbox(R.string.pref_video_use_front_camera_key);
-		}
-
-		if (prefs().getBoolean(LinphoneActivity.PREF_FIRST_LAUNCH,true)) {
-			doOnFirstLaunch();
-		}
-		if (Hacks.hasBuiltInEchoCanceller()) {
-			uncheckDisableAndHideCheckbox(R.string.pref_echo_limiter_key);
-			uncheckDisableAndHideCheckbox(R.string.pref_echo_cancellation_key);
-			uncheckDisableAndHideCheckbox(R.string.pref_echo_canceller_calibration_key);
-		}
-
-
-		detectVideoCodec(R.string.pref_video_codec_h264_key, "H264");
-		if (!Version.hasNeon())
-		{
-			// Android without neon doesn't support H264
-			findPreference(R.string.pref_video_codec_h264_key).setEnabled(false);
-			findPreference(R.string.pref_video_codec_h264_key).setDefaultValue(false);
-		}
-		
-		addEchoPrefsListener();
-		
-		if (Hacks.needSoftvolume()) checkAndDisableCheckbox(R.string.pref_audio_soft_volume_key);
-
-		if (!LinphoneManager.getLc().isTunnelAvailable()){
-			hidePreferenceCategory(R.string.pref_tunnel_key);
-		}
-		
-		if (getResources().getBoolean(R.bool.hide_camera_settings)) {
-			PreferenceScreen screen = getPreferenceScreen();
-			PreferenceCategory videoSettings = (PreferenceCategory) screen.getPreference(CAMERA_SETTINGS_ID);
-			videoSettings.removeAll();
-			videoSettings.setLayoutResource(R.layout.hidden);
-			
-			CheckBoxPreference enableVideo = (CheckBoxPreference) findPreference(R.string.pref_video_enable_key);
-			enableVideo.setLayoutResource(R.layout.hidden);
-		}
+		history.setSelected(false);
+		contacts.setSelected(false);
+		dialer.setSelected(false);
+		settings.setSelected(true);
+		chat.setSelected(false);
 	}
-
-	private void hidePreferenceCategory(int key) {
-		PreferenceCategory p = (PreferenceCategory) findPreference(key);
-		p.removeAll();
-		p.setLayoutResource(R.layout.hidden);
-	}
-
-	private void doOnFirstLaunch() {
-		manageCheckbox(R.string.pref_echo_limiter_key, !Hacks.hasBuiltInEchoCanceller(), true, false);
-		prefs().edit().putBoolean(LinphoneActivity.PREF_FIRST_LAUNCH, false).commit();
-	}
-
-	private void initializeMediaEncryptionPreferences() {
-		LinphoneCore lc=LinphoneManager.getLc();
-		boolean hasZrtp=lc.mediaEncryptionSupported(MediaEncryption.ZRTP);
-		boolean hasSrtp=lc.mediaEncryptionSupported(MediaEncryption.SRTP);
-		if (!hasSrtp && !hasZrtp){
-			mencPref.setEnabled(false);
-		}else{
-			List<CharSequence> mencEntries=new ArrayList<CharSequence>();
-			List<CharSequence> mencEntryValues=new ArrayList<CharSequence>();
-			mencEntries.add(getString(R.string.media_encryption_none));
-			mencEntryValues.add(getString(R.string.pref_media_encryption_key_none));
-			if (hasSrtp){
-				mencEntries.add(getString(R.string.media_encryption_srtp));
-				mencEntryValues.add(getString(R.string.pref_media_encryption_key_srtp));
-			}
-			if (hasZrtp){
-				mencEntries.add(getString(R.string.media_encryption_zrtp));
-				mencEntryValues.add(getString(R.string.pref_media_encryption_key_zrtp));
-			}
-			CharSequence[] contents=new CharSequence[mencEntries.size()];
-			mencEntries.toArray(contents);
-			mencPref.setEntries(contents);
-			contents=new CharSequence[mencEntryValues.size()];
-			mencEntryValues.toArray(contents);
-			mencPref.setEntryValues(contents);
-			mencPref.setDefaultValue(getString(R.string.media_encryption_none));
-			//mencPref.setValueIndex(mencPref.findIndexOfValue(getString(R.string.media_encryption_none)));
-		}
-	}
-
-	private void addEchoPrefsListener(){
-		OnPreferenceChangeListener ec_listener=new OnPreferenceChangeListener(){
-			public boolean onPreferenceChange(Preference arg0, Object newValue) {
-				Boolean val=(Boolean)newValue;
-				if (val){
-					elPref.setChecked(!val);
-				}
-				return true;
-			}
-		};
-		OnPreferenceChangeListener el_listener=new OnPreferenceChangeListener(){
-			public boolean onPreferenceChange(Preference arg0, Object newValue) {
-				Boolean val=(Boolean)newValue;
-				if (val){
-					ecPref.setChecked(!val);
-				}
-				return true;
-			}
-		};
-		ecPref.setOnPreferenceChangeListener(ec_listener);
-		elPref.setOnPreferenceChangeListener(el_listener);
-	}
-
-	private void addTransportChecboxesListener() {
-
-		final List<CheckBoxPreference> checkboxes = Arrays.asList(
-				findCheckbox(R.string.pref_transport_udp_key)
-				,findCheckbox(R.string.pref_transport_tcp_key)
-				,findCheckbox(R.string.pref_transport_tls_key)
-				);
-		
-
-		OnPreferenceChangeListener changedListener = new OnPreferenceChangeListener() {
-			public boolean onPreferenceChange(Preference preference, Object newValue) {
-				if ((Boolean) newValue) {
-					for (CheckBoxPreference p : checkboxes) {
-						if (p == preference) continue;
-						p.setChecked(false);
-					}
-					return true;
-				} else {
-					for (CheckBoxPreference p : checkboxes) {
-						if (p == preference) continue;
-						if (p.isChecked()) return true;
-					}
-					return false;
-				}
-			}
-		};
-		
-		OnPreferenceClickListener clickListener = new OnPreferenceClickListener() {
-			public boolean onPreferenceClick(Preference preference) {
-				// Forbid no protocol selection
-				
-				if (((CheckBoxPreference) preference).isChecked()) {
-					// Trying to unckeck
-					for (CheckBoxPreference p : checkboxes) {
-						if (p == preference) continue;
-						if (p.isChecked()) return false;
-					}
-					/*Toast.makeText(LinphonePreferencesActivity.this,
-							getString(R.string.at_least_a_protocol),
-							Toast.LENGTH_SHORT).show();*/
-					return true;
-				}
-				return false;
-			}
-		};
-
-		for (CheckBoxPreference c : checkboxes) {
-			c.setOnPreferenceChangeListener(changedListener);
-			c.setOnPreferenceClickListener(clickListener);
-		}
-	}
-
-	private synchronized void startEcCalibration() {
-		try {
-			LinphoneManager.getInstance().startEcCalibration(this);
-
-			ecCalibratePref.setSummary(ec_calibrating);
-			ecCalibratePref.getEditor().putBoolean(getString(pref_echo_canceller_calibration_key), false).commit();
-		} catch (LinphoneCoreException e) {
-			Log.w(e, "Cannot calibrate EC");
-		}	
-	}
-
-	public void onEcCalibrationStatus(final EcCalibratorStatus status, final int delayMs) {
-
-		mHandler.post(new Runnable() {
-			public void run() {
-				if (status == EcCalibratorStatus.Done) {
-					ecCalibratePref.setSummary(String.format(getString(R.string.ec_calibrated), delayMs));
-					ecCalibratePref.setChecked(true);
-
-				} else if (status == EcCalibratorStatus.Failed) {
-					ecCalibratePref.setSummary(R.string.failed);
-					ecCalibratePref.setChecked(false);
-					elPref.setChecked(true);
-					ecPref.setChecked(false);
-				}
-			}
-		});
-	}
-
-	private void uncheckDisableAndHideCheckbox(int key) { 
-		manageCheckbox(key, false, false, true);
-	}
-
-	private void uncheckAndDisableCheckbox(int key) {
-		manageCheckbox(key, false, false, false);
-	}
-	private void checkAndDisableCheckbox(int key) {
-		manageCheckbox(key, true, false, false);
-	}
-	private void manageCheckbox(int key, boolean value, boolean enabled, boolean hidden) {
-		CheckBoxPreference box = (CheckBoxPreference) findPreference(key);
-		box.setEnabled(enabled);
-		box.setChecked(value);
-		writeBoolean(key, value);
-		if (hidden) box.setLayoutResource(R.layout.hidden);
-	}
-
-	private Preference findPreference(int key) {
-		return getPreferenceManager().findPreference(getString(key));
-	}
-
-	private void writeBoolean(int key, boolean value) {
-		prefs().edit().putBoolean(getString(key), value).commit();
-	}
-
+	
 	@Override
-	protected void onPause() {
-		super.onPause();
-
-		if (!isFinishing()) return;
-
-		LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull();
+	public void onClick(View v) {
+		int id = v.getId();
 		
-		if (lc != null && (lc.isInComingInvitePending() || lc.isIncall())) {
-			Log.w("Call in progress => settings not applied");
-			return;
+		FragmentsAvailable newFragment = FragmentsAvailable.SETTINGS;
+		if (id == R.id.history) {
+			newFragment = FragmentsAvailable.HISTORY;
 		}
-
-		try {
-			LinphoneManager.getInstance().initFromConf();
-			lc.setVideoPolicy(LinphoneManager.getInstance().isAutoInitiateVideoCalls(), LinphoneManager.getInstance().isAutoAcceptCamera());
-		} catch (LinphoneException e) {
-			if (! (e instanceof LinphoneConfigException)) {
-				Log.e(e, "Cannot update config");
-				return;
-			}
-
-			LinphoneActivity.instance().showPreferenceErrorDialog(e.getMessage());
+		else if (id == R.id.contacts) {
+			newFragment = FragmentsAvailable.CONTACTS;
+		}
+		else if (id == R.id.dialer) {
+			newFragment = FragmentsAvailable.DIALER;
+		}
+		else if (id == R.id.chat) {
+			newFragment = FragmentsAvailable.CHATLIST;
+		}
+		
+		if (newFragment != FragmentsAvailable.SETTINGS) {
+			Intent intent = new Intent();
+			intent.putExtra("FragmentToDisplay", newFragment);
+			setResult(RESULT_FIRST_USER, intent);
+			finish();
+		}
+	}
+	
+	@Override
+	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+		super.onActivityResult(requestCode, resultCode, data);
+		
+		if (resultCode == RESULT_FIRST_USER) {
+			// If we were on a LinphonePreferences sub activity, and we came back because of a change of tab, we propagate the event
+			setResult(RESULT_FIRST_USER, data);
+			finish();
+		}
+	}
+	
+	private void displayMissedCalls(final int missedCallsCount) {
+		if (missedCallsCount > 0) {
+			missedCalls.setText(missedCallsCount + "");
+			missedCalls.setVisibility(View.VISIBLE);
+		} else {
+			missedCalls.setVisibility(View.GONE);
 		}
 	}
-
 }
diff --git a/src/org/linphone/LinphonePreferencesSIPAccountActivity.java b/src/org/linphone/LinphonePreferencesSIPAccountActivity.java
deleted file mode 100644
index c61762e1d..000000000
--- a/src/org/linphone/LinphonePreferencesSIPAccountActivity.java
+++ /dev/null
@@ -1,181 +0,0 @@
-package org.linphone;
-/*
-LinphonePreferencesSIPAccountActivity.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.
-*/
-
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.preference.CheckBoxPreference;
-import android.preference.EditTextPreference;
-import android.preference.Preference;
-import android.preference.Preference.OnPreferenceChangeListener;
-import android.preference.Preference.OnPreferenceClickListener;
-import android.preference.PreferenceActivity;
-import android.preference.PreferenceCategory;
-import android.preference.PreferenceScreen;
-import android.text.InputType;
-
-public class LinphonePreferencesSIPAccountActivity extends PreferenceActivity {
-	
-	protected void onCreate(Bundle savedInstanceState) 
-	{
-		super.onCreate(savedInstanceState);
-		addPreferencesFromResource(R.xml.account_preferences);
-		
-		PreferenceScreen screen = getPreferenceScreen();
-		int n = getIntent().getExtras().getInt("Account", 1);
-		addExtraAccountPreferencesFields(screen, n);
-	}
-	
-	OnPreferenceChangeListener preferenceChangedListener = new OnPreferenceChangeListener() {
-		@Override
-		public boolean onPreferenceChange(Preference preference, Object newValue) {
-			preference.setSummary(newValue.toString());
-			return true;
-		}		
-	};
-	
-	private void addExtraAccountPreferencesFields(PreferenceScreen parent, final int n) {
-    	final SharedPreferences prefs = getPreferenceManager().getSharedPreferences();
-		
-    	EditTextPreference username = new EditTextPreference(this);
-    	username.getEditText().setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS);
-    	username.setTitle(getString(R.string.pref_username));
-    	username.setPersistent(true);
-    	username.setDialogMessage(getString(R.string.pref_help_username));
-    	username.setKey(getString(R.string.pref_username_key) + getAccountNumber(n));
-    	username.setOnPreferenceChangeListener(preferenceChangedListener);
-    	
-    	EditTextPreference password = new EditTextPreference(this);
-    	password.getEditText().setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
-    	password.setTitle(getString(R.string.pref_passwd));
-    	password.setPersistent(true);
-    	password.setKey(getString(R.string.pref_passwd_key) + getAccountNumber(n));
-    	
-    	EditTextPreference domain = new EditTextPreference(this);
-    	domain.getEditText().setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS);
-    	domain.setTitle(getString(R.string.pref_domain));
-    	domain.setPersistent(true);
-    	domain.setDialogMessage(getString(R.string.pref_help_domain));
-    	domain.setKey(getString(R.string.pref_domain_key) + getAccountNumber(n));
-    	domain.setOnPreferenceChangeListener(preferenceChangedListener);
-    	
-    	EditTextPreference proxy = new EditTextPreference(this);
-    	proxy.getEditText().setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS);
-    	proxy.setTitle(getString(R.string.pref_proxy));
-    	proxy.setPersistent(true);
-    	proxy.setKey(getString(R.string.pref_proxy_key) + getAccountNumber(n));
-    	proxy.setOnPreferenceChangeListener(preferenceChangedListener);
-    	
-    	CheckBoxPreference outboundProxy = new CheckBoxPreference(this);
-    	outboundProxy.setTitle(getString(R.string.pref_enable_outbound_proxy));
-    	outboundProxy.setPersistent(true);
-    	outboundProxy.setKey(getString(R.string.pref_enable_outbound_proxy_key) + getAccountNumber(n));
-   
-    	final CheckBoxPreference disable = new CheckBoxPreference(this);
-    	disable.setTitle(getString(R.string.pref_disable_account));
-    	disable.setPersistent(true);
-    	disable.setKey(getString(R.string.pref_disable_account_key) + getAccountNumber(n));
-
-    	final Preference delete = new Preference(this);
-    	delete.setTitle(R.string.pref_delete_account);
-    	delete.setOnPreferenceClickListener(new OnPreferenceClickListener() {
-	        public boolean onPreferenceClick(Preference preference) {
-	        	int nbAccounts = prefs.getInt(getString(R.string.pref_extra_accounts), 1);
-        		SharedPreferences.Editor editor = prefs.edit();
-        		
-	        	for (int i = n; i < nbAccounts - 1; i++) {
-	        		editor.putString(getString(R.string.pref_username_key) + getAccountNumber(i), prefs.getString(getString(R.string.pref_username_key) + getAccountNumber(i+1), null));
-	        		editor.putString(getString(R.string.pref_passwd_key) + getAccountNumber(i), prefs.getString(getString(R.string.pref_passwd_key) + getAccountNumber(i+1), null));
-	        		editor.putString(getString(R.string.pref_domain_key) + getAccountNumber(i), prefs.getString(getString(R.string.pref_domain_key) + getAccountNumber(i+1), null));
-	        		editor.putString(getString(R.string.pref_proxy_key) + getAccountNumber(i), prefs.getString(getString(R.string.pref_proxy_key) + getAccountNumber(i+1), null));
-	        		editor.putBoolean(getString(R.string.pref_enable_outbound_proxy_key) + getAccountNumber(i), prefs.getBoolean(getString(R.string.pref_enable_outbound_proxy_key) + getAccountNumber(i+1), false));
-	        		editor.putBoolean(getString(R.string.pref_disable_account_key) + getAccountNumber(i), prefs.getBoolean(getString(R.string.pref_disable_account_key) + getAccountNumber(i+1), false));
-	        	}
-	        	
-	        	int lastAccount = nbAccounts - 1;
-	        	editor.putString(getString(R.string.pref_username_key) + getAccountNumber(lastAccount), null);
-        		editor.putString(getString(R.string.pref_passwd_key) + getAccountNumber(lastAccount), null);
-        		editor.putString(getString(R.string.pref_domain_key) + getAccountNumber(lastAccount), null);
-        		editor.putString(getString(R.string.pref_proxy_key) + getAccountNumber(lastAccount), null);
-        		editor.putBoolean(getString(R.string.pref_enable_outbound_proxy_key) + getAccountNumber(lastAccount), false);
-        		editor.putBoolean(getString(R.string.pref_disable_account_key) + getAccountNumber(lastAccount), false);
-        		
-        		int defaultAccount = prefs.getInt(getString(R.string.pref_default_account), 0);
-        		if (defaultAccount > n) {
-        			editor.putInt(getString(R.string.pref_default_account), defaultAccount - 1);
-        		}
-        		
-        		editor.putInt(getString(R.string.pref_extra_accounts), nbAccounts - 1);
-	        	editor.commit();
-	        	LinphonePreferencesSIPAccountActivity.this.finish();
-	        	return true;
-	        }
-        });
-    	
-    	CheckBoxPreference mainAccount = new CheckBoxPreference(this);
-    	mainAccount.setTitle(R.string.pref_default_account_title);
-    	mainAccount.setOnPreferenceClickListener(new OnPreferenceClickListener() 
-    	{
-			public boolean onPreferenceClick(Preference preference) {
-				
-				SharedPreferences.Editor editor = prefs.edit();
-				editor.putInt(getString(R.string.pref_default_account), n);
-				editor.commit();
-				delete.setEnabled(false);
-				disable.setEnabled(false);
-				disable.setChecked(false);
-				preference.setEnabled(false);
-				return true;
-			}
-		});
-    	
-    	mainAccount.setChecked(prefs.getInt(getString(R.string.pref_default_account), 0) == n);
-    	mainAccount.setEnabled(!mainAccount.isChecked());
-    	delete.setEnabled(prefs.getInt(getString(R.string.pref_default_account), 0) != n);
-    	disable.setEnabled(prefs.getInt(getString(R.string.pref_default_account), 0) != n);
-    	
-		PreferenceCategory category = new PreferenceCategory(this);
-		category.setTitle(getString(R.string.pref_sipaccount));
-    	parent.addPreference(category);
-    	category.addPreference(username);
-    	category.addPreference(password);
-    	category.addPreference(domain);
-    	
-    	category = new PreferenceCategory(this);
-		category.setTitle(getString(R.string.pref_advanced));
-		parent.addPreference(category);
-    	category.addPreference(proxy);
-    	category.addPreference(outboundProxy);
-    	category.addPreference(disable);
-    	category.addPreference(mainAccount);
-    	category.addPreference(delete);
-    	
-    	username.setSummary(username.getText());
-    	domain.setSummary(domain.getText());
-    	proxy.setSummary("".equals(proxy.getText()) || (proxy.getText() == null) ? getString(R.string.pref_help_proxy) : proxy.getText());
-    	outboundProxy.setSummary(getString(R.string.pref_help_outbound_proxy));
-	}
-	
-	private String getAccountNumber(int n) {
-		if (n > 0)
-			return Integer.toString(n);
-		else
-			return "";
-	}
-}
\ No newline at end of file
diff --git a/src/org/linphone/LinphoneService.java b/src/org/linphone/LinphoneService.java
index 09240f529..3cbebe561 100644
--- a/src/org/linphone/LinphoneService.java
+++ b/src/org/linphone/LinphoneService.java
@@ -96,9 +96,11 @@ public final class LinphoneService extends Service implements LinphoneServiceLis
 	
 	private final static int NOTIF_ID=1;
 	private final static int INCALL_NOTIF_ID=2;
+	private final static int MESSAGE_NOTIF_ID=3;
 
 	private Notification mNotif;
 	private Notification mIncallNotif;
+	private Notification mMsgNotif;
 	private PendingIntent mNotifContentIntent;
 	private String mNotificationTitle;
 
@@ -230,6 +232,20 @@ public final class LinphoneService extends Service implements LinphoneServiceLis
 		}
 	}
 
+	public void displayMessageNotification(String from, String message) {
+		if (mMsgNotif == null) {
+			mMsgNotif = new Notification();
+			
+			mMsgNotif.icon = R.drawable.chaticon;
+			mMsgNotif.iconLevel = 0;
+			mMsgNotif.when=System.currentTimeMillis();
+			mMsgNotif.flags &= Notification.FLAG_ONGOING_EVENT;
+			
+			String title = "New message from %s :".replace("%s", from);
+			mMsgNotif.setLatestEventInfo(this, title, message, mNotifContentIntent);
+			notifyWrapper(MESSAGE_NOTIF_ID, mMsgNotif);
+		}
+	}
 
 	private static final Class<?>[] mSetFgSign = new Class[] {boolean.class};
 	private static final Class<?>[] mStartFgSign = new Class[] {
@@ -381,11 +397,11 @@ public final class LinphoneService extends Service implements LinphoneServiceLis
 
 	
 	private static final LinphoneGuiListener guiListener() {
-		return DialerActivity.instance();
+		return null;
 	}
 
 	private static final LinphoneOnCallStateChangedListener incallListener() {
-		return IncallActivity.instance();
+		return InCallActivity.instance();
 	}
 	
 	
diff --git a/src/org/linphone/LinphoneSimpleListener.java b/src/org/linphone/LinphoneSimpleListener.java
index 72744008b..c01258e96 100644
--- a/src/org/linphone/LinphoneSimpleListener.java
+++ b/src/org/linphone/LinphoneSimpleListener.java
@@ -18,6 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 package org.linphone;
 
+import org.linphone.core.LinphoneAddress;
 import org.linphone.core.LinphoneCall;
 import org.linphone.core.LinphoneCall.State;
 import org.linphone.core.LinphoneCore.GlobalState;
@@ -57,5 +58,13 @@ public interface LinphoneSimpleListener {
 		public enum AudioState {EARPIECE, SPEAKER}
 		void onAudioStateChanged(AudioState state);
 	}
+	
+	public static interface LinphoneOnMessageReceived extends LinphoneSimpleListener {
+		void onMessageReceived(LinphoneAddress from, String message);
+	}
+
+	public static interface LinphoneOnRegistrationStateChangedListener extends LinphoneSimpleListener {
+		void onRegistrationStateChanged(RegistrationState state);
+	}
 
 }
diff --git a/src/org/linphone/UriPickerActivity.java b/src/org/linphone/UriPickerActivity.java
deleted file mode 100644
index bf6072664..000000000
--- a/src/org/linphone/UriPickerActivity.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
-LinphoneActivity.java
-Copyright (C) 2010  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 org.linphone.mediastream.Version;
-import org.linphone.ui.AddressAware;
-import org.linphone.ui.AddressText;
-
-import android.app.Activity;
-import android.app.TabActivity;
-import android.content.Intent;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.os.Bundle;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.TabWidget;
-import android.widget.TabHost.TabSpec;
-
-/**
- * @author Guillaume Beraudo
- */
-public class UriPickerActivity extends TabActivity implements ContactPicked {
-	private static final String DIALER_TAB = "dialer";
-	public static final String EXTRA_CALLEE_NAME = "callee_name";
-	public static final String EXTRA_CALLEE_URI = "callee_uri";
-	public static final String EXTRA_CALLEE_PHOTO_URI = "callee_photo_uri";
-	public static final String EXTRA_PICKER_TYPE = "picker_type";
-	public static final String EXTRA_PICKER_TYPE_ADD = "picker_type_add";
-	public static final String EXTRA_PICKER_TYPE_TRANSFER = "picker_type_transfer";
-
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.main);
-		fillTabHost();
-	}
-
-
-	private synchronized void fillTabHost() {
-		if (((TabWidget) findViewById(android.R.id.tabs)).getChildCount() != 0) return;
-
-		startActivityInTab("history",
-				new Intent().setClass(this, HistoryActivity.class),
-				R.string.tab_history, R.drawable.history_orange);
-
-
-		startActivityInTab(DIALER_TAB,
-				new Intent().setClass(this, DialerActivity.class).setData(getIntent().getData())
-				.putExtra(EXTRA_PICKER_TYPE, getIntent().getStringExtra(EXTRA_PICKER_TYPE)),
-				R.string.tab_dialer, R.drawable.dialer_orange);
-
-
-		startActivityInTab("contact",
-				new Intent().setClass(this, Version.sdkAboveOrEqual(Version.API05_ECLAIR_20) ?
-						ContactPickerActivityNew.class : ContactPickerActivityOld.class),
-						R.string.tab_contact, R.drawable.contact_orange);
-
-
-		selectDialerTab();
-	}
-
-
-	private void selectDialerTab() {
-		getTabHost().setCurrentTabByTag(DIALER_TAB);
-	}
-
-	private void startActivityInTab(String tag, Intent intent, int indicatorId, int drawableId) {
-		Drawable tabDrawable = getResources().getDrawable(drawableId);
-		TabSpec spec = getTabHost().newTabSpec(tag)
-		.setIndicator(getString(indicatorId), tabDrawable)
-		.setContent(intent);
-		getTabHost().addTab(spec);
-	}
-
-
-	
-	void terminate(String number, String name, Uri photo) {
-		Intent intent = new Intent()
-		.putExtra(EXTRA_CALLEE_NAME, name)
-		.putExtra(EXTRA_CALLEE_URI, number)
-		.putExtra(EXTRA_CALLEE_PHOTO_URI, photo);
-		setResult(Activity.RESULT_OK, intent);
-		finish();
-	}
-
-	
-	
-	
-	
-	public static class DialerActivity extends Activity implements OnClickListener {
-
-		private AddressText mAddress;
-		private Button addButton;
-
-		@Override
-		protected void onCreate(Bundle savedInstanceState) {
-			setContentView(R.layout.simplified_dialer);
-			mAddress = (AddressText) findViewById(R.id.SipUri);
-
-			addButton = (Button) findViewById(R.id.AddCallButton);
-//			addButton.setCompoundDrawablePadding(100);
-			addButton.setOnClickListener(this);
-			String type = getIntent().getStringExtra(EXTRA_PICKER_TYPE);
-			if (EXTRA_PICKER_TYPE_ADD.equals(type)) {
-				addButton.setCompoundDrawablesWithIntrinsicBounds(0, R.drawable.incall_add_small, 0, 0);
-				addButton.setText(getString(R.string.AddCallButtonText));
-			} else if (EXTRA_PICKER_TYPE_TRANSFER.equals(type)) {
-				addButton.setCompoundDrawablesWithIntrinsicBounds(0, R.drawable.picker_transfer, 0, 0);
-				addButton.setText(getString(R.string.TransferCallButtonText));
-			} else {
-				throw new RuntimeException("unknown type");
-			}
-
-//			findViewById(R.id.AddCallCancelButton).setOnClickListener(this);
-
-			((AddressAware)findViewById(R.id.Dialer)).setAddressWidget(mAddress);
-			((AddressAware)findViewById(R.id.Erase)).setAddressWidget(mAddress);
-			super.onCreate(savedInstanceState);
-		}
-
-		public void setContactAddress(String number, String name, Uri photo) {
-			mAddress.setText(number);
-			mAddress.setDisplayedName(name);
-			mAddress.setPictureUri(photo);
-		}
-
-		@Override
-		public void onClick(View v) {
-			if (v == addButton) {
-			UriPickerActivity parent = (UriPickerActivity) getParent();
-			parent.terminate(mAddress.getText().toString(), mAddress.getDisplayedName(), mAddress.getPictureUri());
-			} else {
-				// propagate finish to parent through finishFromChild
-				finish();
-			}
-		}
-	}
-
-
-	public void setAddressAndGoToDialer(String number, String name, Uri photo) {
-		DialerActivity dialer = (DialerActivity) getLocalActivityManager().getActivity(DIALER_TAB);
-		dialer.setContactAddress(number, name, photo);
-		selectDialerTab();
-	}
-
-
-	@Override
-	public void goToDialer() {
-		selectDialerTab();
-	}
-}
diff --git a/src/org/linphone/VideoCallActivity.java b/src/org/linphone/VideoCallActivity.java
deleted file mode 100755
index 7551bc229..000000000
--- a/src/org/linphone/VideoCallActivity.java
+++ /dev/null
@@ -1,577 +0,0 @@
-/*
-VideoCallActivity.java
-Copyright (C) 2010  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 org.linphone.LinphoneSimpleListener.LinphoneOnCallStateChangedListener;
-import org.linphone.compatibility.Compatibility;
-import org.linphone.core.LinphoneCall;
-import org.linphone.core.LinphoneCall.State;
-import org.linphone.core.LinphoneCallParams;
-import org.linphone.core.Log;
-import org.linphone.mediastream.Version;
-import org.linphone.mediastream.video.AndroidVideoWindowImpl;
-import org.linphone.mediastream.video.capture.hwconf.AndroidCameraConfiguration;
-import org.linphone.ui.Numpad;
-import org.linphone.ui.ToggleImageButton;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.res.Configuration;
-import android.content.res.Resources;
-import android.opengl.GLSurfaceView;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.PowerManager;
-import android.os.PowerManager.WakeLock;
-import android.util.TypedValue;
-import android.view.Display;
-import android.view.KeyEvent;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.MotionEvent;
-import android.view.Surface;
-import android.view.SurfaceHolder;
-import android.view.SurfaceView;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.View.OnTouchListener;
-import android.view.WindowManager;
-import android.widget.Checkable;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
-import android.widget.RelativeLayout.LayoutParams;
-
-/**
- * For Android SDK >= 5
- * 
- * @author Guillaume Beraudo
- * 
- */
-public class VideoCallActivity extends Activity implements
-		LinphoneOnCallStateChangedListener, OnClickListener {
-	private final static int DELAY_BEFORE_HIDING_CONTROLS = 2000;
-	private static final int numpadDialogId = 1;
-
-	private SurfaceView mVideoViewReady;
-	private SurfaceView mVideoCaptureViewReady;
-	public static boolean launched = false;
-	private LinphoneCall videoCall;
-	private WakeLock mWakeLock;
-	private Handler refreshHandler = new Handler();
-	private Handler controlsHandler = new Handler();
-	AndroidVideoWindowImpl androidVideoWindowImpl;
-	private Runnable mCallQualityUpdater, mControls;
-	private LinearLayout mControlsLayout;
-
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		if (!LinphoneManager.isInstanciated()
-				|| LinphoneManager.getLc().getCallsNb() == 0) {
-			Log.e("No service running: avoid crash by finishing ", getClass()
-					.getName());
-			// super.onCreate called earlier
-			finish();
-			return;
-		}
-
-		setContentView(R.layout.videocall);
-
-		SurfaceView videoView = (SurfaceView) findViewById(R.id.video_surface);
-
-		// ((FrameLayout)
-		// findViewById(R.id.video_frame)).bringChildToFront(findViewById(R.id.imageView1));
-
-		SurfaceView captureView = (SurfaceView) findViewById(R.id.video_capture_surface);
-		captureView.getHolder()
-				.setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
-
-		/* force surfaces Z ordering */
-		fixZOrder(videoView, captureView);
-
-		androidVideoWindowImpl = new AndroidVideoWindowImpl(videoView,
-				captureView);
-		androidVideoWindowImpl
-				.setListener(new AndroidVideoWindowImpl.VideoWindowListener() {
-
-					public void onVideoRenderingSurfaceReady(
-							AndroidVideoWindowImpl vw, SurfaceView surface) {
-						LinphoneManager.getLc().setVideoWindow(vw);
-						mVideoViewReady = surface;
-					}
-
-					public void onVideoRenderingSurfaceDestroyed(
-							AndroidVideoWindowImpl vw) {
-						Log.d("VIDEO WINDOW destroyed!\n");
-						LinphoneManager.getLc().setVideoWindow(null);
-					}
-
-					public void onVideoPreviewSurfaceReady(
-							AndroidVideoWindowImpl vw, SurfaceView surface) {
-						mVideoCaptureViewReady = surface;
-						LinphoneManager.getLc().setPreviewWindow(
-								mVideoCaptureViewReady);
-					}
-
-					public void onVideoPreviewSurfaceDestroyed(
-							AndroidVideoWindowImpl vw) {
-						// Remove references kept in jni code and restart camera
-						LinphoneManager.getLc().setPreviewWindow(null);
-					}
-				});
-
-		androidVideoWindowImpl.init();
-
-		videoCall = LinphoneManager.getLc().getCurrentCall();
-		if (videoCall != null) {
-			LinphoneManager lm = LinphoneManager.getInstance();
-			if (!lm.shareMyCamera()	&& videoCall.cameraEnabled()) {
-				lm.sendStaticImage(true);
-			}
-
-			updatePreview(videoCall.cameraEnabled());
-		}
-
-		PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
-		mWakeLock = pm.newWakeLock(PowerManager.SCREEN_BRIGHT_WAKE_LOCK
-				| PowerManager.ON_AFTER_RELEASE, Log.TAG);
-		mWakeLock.acquire();
-
-		mControlsLayout = (LinearLayout) findViewById(R.id.incall_controls_layout);
-		videoView.setOnTouchListener(new OnTouchListener() {
-			public boolean onTouch(View v, MotionEvent event) {
-				if (mControlsLayout != null
-						&& mControlsLayout.getVisibility() == View.GONE) {
-					mControlsLayout.setVisibility(View.VISIBLE);
-					controlsHandler.postDelayed(mControls = new Runnable() {
-						public void run() {
-							mControlsLayout.setVisibility(View.GONE);
-						}
-					}, DELAY_BEFORE_HIDING_CONTROLS);
-
-					return true;
-				}
-				return false;
-			}
-		});
-
-		if (!AndroidCameraConfiguration.hasSeveralCameras()) {
-			View v=findViewById(R.id.switch_camera);
-			if (v!=null) v.setVisibility(View.GONE);
-		}
-
-		if (Version.isXLargeScreen(this)) {
-			findViewById(R.id.toggleMuteMic).setOnClickListener(this);
-			findViewById(R.id.toggleSpeaker).setOnClickListener(this);
-			findViewById(R.id.incallNumpadShow).setOnClickListener(this);
-			findViewById(R.id.back).setOnClickListener(this);
-			findViewById(R.id.incallHang).setOnClickListener(this);
-			findViewById(R.id.switch_camera).setOnClickListener(this);
-			findViewById(R.id.conf_simple_pause).setOnClickListener(this);
-			findViewById(R.id.conf_simple_video).setOnClickListener(this);
-
-			if (LinphoneManager.getInstance().isSpeakerOn()) {
-				ToggleImageButton speaker = (ToggleImageButton) findViewById(R.id.toggleSpeaker);
-				speaker.setChecked(true);
-				speaker.setEnabled(false);
-			}
-		}
-	}
-
-	void updateQualityOfSignalIcon(float quality) {
-		ImageView qos = (ImageView) findViewById(R.id.QoS);
-		if (quality >= 4) // Good Quality
-		{
-			qos.setImageDrawable(getResources().getDrawable(
-					R.drawable.stat_sys_signal_4));
-		} else if (quality >= 3) // Average quality
-		{
-			qos.setImageDrawable(getResources().getDrawable(
-					R.drawable.stat_sys_signal_3));
-		} else if (quality >= 2) // Low quality
-		{
-			qos.setImageDrawable(getResources().getDrawable(
-					R.drawable.stat_sys_signal_2));
-		} else if (quality >= 1) // Very low quality
-		{
-			qos.setImageDrawable(getResources().getDrawable(
-					R.drawable.stat_sys_signal_1));
-		} else // Worst quality
-		{
-			qos.setImageDrawable(getResources().getDrawable(
-					R.drawable.stat_sys_signal_0));
-		}
-	}
-
-	private void rewriteToggleCameraItem(MenuItem item) {
-		if (LinphoneManager.getLc().getCurrentCall().cameraEnabled()) {
-			item.setTitle(getString(R.string.menu_videocall_toggle_camera_disable));
-		} else {
-			item.setTitle(getString(R.string.menu_videocall_toggle_camera_enable));
-		}
-	}
-
-	private void rewriteChangeResolutionItem(MenuItem item) {
-		if (BandwidthManager.getInstance().isUserRestriction()) {
-			item.setTitle(getString(R.string.menu_videocall_change_resolution_when_low_resolution));
-		} else {
-			item.setTitle(getString(R.string.menu_videocall_change_resolution_when_high_resolution));
-		}
-	}
-
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-		if (Version.isXLargeScreen(this))
-			return false;
-		
-		// Inflate the currently selected menu XML resource.
-		MenuInflater inflater = getMenuInflater();
-		inflater.inflate(R.menu.videocall_activity_menu, menu);
-
-		rewriteToggleCameraItem(menu
-				.findItem(R.id.videocall_menu_toggle_camera));
-		rewriteChangeResolutionItem(menu
-				.findItem(R.id.videocall_menu_change_resolution));
-
-		if (!AndroidCameraConfiguration.hasSeveralCameras()) {
-			menu.findItem(R.id.videocall_menu_switch_camera).setVisible(false);
-		}
-		return true;
-	}
-
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item) {
-		int id = item.getItemId();
-		if (id == R.id.videocall_menu_back_to_dialer) {
-			finish();
-			LinphoneActivity.instance().startIncallActivity();
-		}
-		else if (id == R.id.videocall_menu_change_resolution) {
-			LinphoneManager.getInstance().changeResolution();
-			// previous call will cause graph reconstruction -> regive preview
-			// window
-			if (mVideoCaptureViewReady != null)
-				LinphoneManager.getLc()
-						.setPreviewWindow(mVideoCaptureViewReady);
-			rewriteChangeResolutionItem(item);
-		}
-		else if (id == R.id.videocall_menu_terminate_call) {
-			LinphoneManager.getInstance().terminateCall();
-		}
-		else if (id == R.id.videocall_menu_toggle_camera) {
-			boolean camEnabled = LinphoneManager.getInstance()
-					.toggleEnableCamera();
-			updatePreview(camEnabled);
-			Log.e("winwow camera enabled: " + camEnabled);
-			rewriteToggleCameraItem(item);
-			// previous call will cause graph reconstruction -> regive preview
-			// window
-			if (camEnabled) {
-				if (mVideoCaptureViewReady != null)
-					LinphoneManager.getLc().setPreviewWindow(
-							mVideoCaptureViewReady);
-			} else
-				LinphoneManager.getLc().setPreviewWindow(null);
-		}
-		else if (id == R.id.videocall_menu_switch_camera) {
-			int videoDeviceId = LinphoneManager.getLc().getVideoDevice();
-			videoDeviceId = (videoDeviceId + 1) % AndroidCameraConfiguration.retrieveCameras().length;
-			LinphoneManager.getLc().setVideoDevice(videoDeviceId);
-			CallManager.getInstance().updateCall();
-			// previous call will cause graph reconstruction -> regive preview
-			// window
-			if (mVideoCaptureViewReady != null)
-				LinphoneManager.getLc()
-						.setPreviewWindow(mVideoCaptureViewReady);
-		}
-		else {
-			Log.e("Unknown menu item [", item, "]");
-		}
-		return true;
-	}
-
-	void updatePreview(boolean cameraCaptureEnabled) {
-		mVideoCaptureViewReady = null;
-		if (cameraCaptureEnabled) {
-			findViewById(R.id.imageView1).setVisibility(View.INVISIBLE);
-			findViewById(R.id.video_capture_surface)
-					.setVisibility(View.VISIBLE);
-		} else {
-			findViewById(R.id.video_capture_surface).setVisibility(
-					View.INVISIBLE);
-			findViewById(R.id.imageView1).setVisibility(View.VISIBLE);
-		}
-		findViewById(R.id.video_frame).requestLayout();
-	}
-
-	void fixZOrder(SurfaceView video, SurfaceView preview) {
-		video.setZOrderOnTop(false);
-		preview.setZOrderOnTop(true);
-	}
-
-	@Override
-	protected void onResume() {
-		if (!LinphoneManager.getLc().isIncall())
-			finish();
-		
-		super.onResume();
-		if (mVideoViewReady != null)
-			((GLSurfaceView) mVideoViewReady).onResume();
-		synchronized (androidVideoWindowImpl) {
-			LinphoneManager.getLc().setVideoWindow(androidVideoWindowImpl);
-		}
-		launched = true;
-		LinphoneManager.addListener(this);
-
-		refreshHandler.postDelayed(mCallQualityUpdater = new Runnable() {
-			LinphoneCall mCurrentCall = LinphoneManager.getLc()
-					.getCurrentCall();
-
-			public void run() {
-				if (mCurrentCall == null) {
-					mCallQualityUpdater = null;
-					return;
-				}
-				int oldQuality = 0;
-				float newQuality = mCurrentCall.getCurrentQuality();
-				if ((int) newQuality != oldQuality) {
-					updateQualityOfSignalIcon(newQuality);
-				}
-				if (launched) {
-					refreshHandler.postDelayed(this, 1000);
-				} else
-					mCallQualityUpdater = null;
-			}
-		}, 1000);
-
-		if (mControlsLayout != null)
-			mControlsLayout.setVisibility(View.GONE);
-
-		if (videoCall != null && LinphoneManager.getInstance().shareMyCamera()) {
-			videoCall.enableCamera(true);
-			updatePreview(videoCall.cameraEnabled());
-		}
-	}
-
-	public boolean onKeyDown(int keyCode, KeyEvent event) {
-		if (LinphoneUtils.onKeyVolumeSoftAdjust(keyCode))
-			return true;
-		if (Version.isXLargeScreen(this) && LinphoneUtils.onKeyBackGoHome(this, keyCode, event)) {
-			return true;
-		} else if (!Version.isXLargeScreen(this) && keyCode == KeyEvent.KEYCODE_BACK) {
-			LinphoneActivity.instance().startIncallActivity();
-			finish();
-			return true;
-		}
-		return super.onKeyDown(keyCode, event);
-	}
-
-	@Override
-	protected void onDestroy() {
-		if (androidVideoWindowImpl != null) { // Prevent linphone from crashing
-												// if correspondent hang up
-												// while you are rotating
-			androidVideoWindowImpl.release();
-		}
-		super.onDestroy();
-	}
-
-	@Override
-	protected void onPause() {
-		Log.d("onPause VideoCallActivity (isFinishing:", isFinishing(),
-				", inCall:", LinphoneManager.getLc().isIncall(), ")");
-		LinphoneManager.removeListener(this);
-		
-		// Send NoWebcam since Android 4.0 can't get the video from the
-		// webcam if the activity is not in foreground
-		if (videoCall != null)
-			videoCall.enableCamera(false);
-		
-		if (isFinishing()) {
-			videoCall = null; // release reference
-		}
-		launched = false;
-		synchronized (androidVideoWindowImpl) {
-			/*
-			 * this call will destroy native opengl renderer which is used by
-			 * androidVideoWindowImpl
-			 */
-			LinphoneManager.getLc().setVideoWindow(null);
-		}
-
-		if (mCallQualityUpdater != null) {
-			refreshHandler.removeCallbacks(mCallQualityUpdater);
-			mCallQualityUpdater = null;
-		}
-		if (mControls != null) {
-			controlsHandler.removeCallbacks(mControls);
-			mControls = null;
-		}
-
-		if (mWakeLock.isHeld())
-			mWakeLock.release();
-		super.onPause();
-		if (mVideoViewReady != null)
-			((GLSurfaceView) mVideoViewReady).onPause();
-	}
-
-	@Override
-	public void onCallStateChanged(LinphoneCall call, State state,
-			String message) {
-		if (call == videoCall && state == State.CallEnd) {
-			BandwidthManager.getInstance().setUserRestriction(false);
-			LinphoneManager.getInstance().resetCameraFromPreferences();
-			finish();
-		} else if (!call.getCurrentParamsCopy().getVideoEnabled()) {
-			finish();
-		}
-	}
-	
-	private int dpToPixels(int dp){
-        Resources r = getResources();
-        int px = (int)TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, 
-        r.getDisplayMetrics());
-        return px;
-	}
-
-	private void resizePreview() {
-		Display display = ((WindowManager) getSystemService(Context.WINDOW_SERVICE))
-				.getDefaultDisplay();
-		
-		int rotation = Compatibility.getRotation(display);
-		LayoutParams params;
-
-		int w, h;
-		if (Version.isXLargeScreen(this)) {
-			w = 176;
-			h = 148;
-		} else {
-			w = 74;
-			h = 88;
-		}
-
-		if (rotation == Surface.ROTATION_90 || rotation == Surface.ROTATION_270) {
-			params = new LayoutParams(dpToPixels(h), dpToPixels(w));
-		} else {
-			params = new LayoutParams(dpToPixels(w), dpToPixels(h));
-		}
-		params.setMargins(0, 0, 15, 15);
-		params.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM);
-		params.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
-		if (mVideoViewReady != null && mVideoCaptureViewReady != null)
-			mVideoCaptureViewReady.setLayoutParams(params);
-	}
-
-	public void onConfigurationChanged(Configuration newConfig) {
-		resizePreview();
-		super.onConfigurationChanged(null);
-	}
-
-	private void resetControlsLayoutExpiration() {
-		if (mControls != null) {
-			controlsHandler.removeCallbacks(mControls);
-		}
-
-		controlsHandler.postDelayed(mControls = new Runnable() {
-			public void run() {
-				mControlsLayout.setVisibility(View.GONE);
-			}
-		}, DELAY_BEFORE_HIDING_CONTROLS);
-	}
-
-	public void onClick(View v) {
-		resetControlsLayoutExpiration();
-		int id = v.getId();
-		if (id == R.id.incallHang) {
-			terminateCurrentCallOrConferenceOrAll();
-		}
-		else if (id == R.id.toggleSpeaker) {
-			if (((Checkable) v).isChecked()) {
-				LinphoneManager.getInstance().routeAudioToSpeaker();
-			} else {
-				LinphoneManager.getInstance().routeAudioToReceiver();
-			}
-		}
-		else if (id == R.id.incallNumpadShow) {
-			showDialog(numpadDialogId);
-		}
-		else if (id == R.id.toggleMuteMic) {
-			LinphoneManager.getLc().muteMic(((Checkable) v).isChecked());
-		}
-		else if (id == R.id.switch_camera) {
-			int videoDeviceId = LinphoneManager.getLc().getVideoDevice();
-			videoDeviceId = (videoDeviceId + 1) % AndroidCameraConfiguration.retrieveCameras().length;
-			LinphoneManager.getLc().setVideoDevice(videoDeviceId);
-			CallManager.getInstance().updateCall();
-			// previous call will cause graph reconstruction -> regive preview
-			// window
-			if (mVideoCaptureViewReady != null)
-				LinphoneManager.getLc()
-						.setPreviewWindow(mVideoCaptureViewReady);
-		}
-		else if (id == R.id.conf_simple_pause) {
-			finish();
-			LinphoneActivity.instance().startIncallActivity();
-			LinphoneManager.getLc().pauseCall(videoCall);
-		}
-		else if (id == R.id.conf_simple_video) {
-			LinphoneCallParams params = videoCall.getCurrentParamsCopy();
-			params.setVideoEnabled(false);
-			LinphoneManager.getLc().updateCall(videoCall, params);
-		}
-		else if (id == R.id.back) {
-			finish();
-			LinphoneActivity.instance().startIncallActivity();
-		}
-	}
-
-	protected Dialog onCreateDialog(final int id) {
-		switch (id) {
-		case numpadDialogId:
-			Numpad numpad = new Numpad(this, true);
-			return new AlertDialog.Builder(this)
-					.setView(numpad)
-					.setPositiveButton(R.string.close_button_text,
-							new DialogInterface.OnClickListener() {
-								public void onClick(DialogInterface dialog,
-										int whichButton) {
-									dismissDialog(id);
-								}
-							}).create();
-		default:
-			throw new IllegalArgumentException("unkown dialog id " + id);
-		}
-	}
-
-	private void terminateCurrentCallOrConferenceOrAll() {
-		LinphoneCall currentCall = LinphoneManager.getLc().getCurrentCall();
-		if (currentCall != null) {
-			LinphoneManager.getLc().terminateCall(currentCall);
-		} else if (LinphoneManager.getLc().isInConference()) {
-			LinphoneManager.getLc().terminateConference();
-		} else {
-			LinphoneManager.getLc().terminateAllCalls();
-		}
-		finish();
-	}
-}
diff --git a/src/org/linphone/compatibility/API4Compatibility.java b/src/org/linphone/compatibility/API4Compatibility.java
deleted file mode 100644
index 62aad0f7b..000000000
--- a/src/org/linphone/compatibility/API4Compatibility.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.linphone.compatibility;
-
-import android.view.Display;
-
-public class API4Compatibility {
-
-	public static int getRotation(Display display) {
-		return display.getOrientation();
-	}
-}
diff --git a/src/org/linphone/compatibility/API8Compatibility.java b/src/org/linphone/compatibility/API8Compatibility.java
deleted file mode 100644
index 07567b09d..000000000
--- a/src/org/linphone/compatibility/API8Compatibility.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.linphone.compatibility;
-
-import android.view.Display;
-
-public class API8Compatibility {
-
-	public static int getRotation(Display display) {
-		return display.getRotation();
-	}
-}
diff --git a/src/org/linphone/compatibility/Compatibility.java b/src/org/linphone/compatibility/Compatibility.java
deleted file mode 100644
index ce05a237d..000000000
--- a/src/org/linphone/compatibility/Compatibility.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.linphone.compatibility;
-
-import org.linphone.mediastream.Version;
-
-import android.view.Display;
-
-public class Compatibility {
-
-	public static int getRotation(Display display) {
-		if (Version.sdkStrictlyBelow(8)) {
-			return API4Compatibility.getRotation(display);
-		} else {
-			return API8Compatibility.getRotation(display);
-		}
-	}
-	
-}
diff --git a/src/org/linphone/core/LinphoneCallLogImpl.java b/src/org/linphone/core/LinphoneCallLogImpl.java
index 1bdb84720..996b51c10 100644
--- a/src/org/linphone/core/LinphoneCallLogImpl.java
+++ b/src/org/linphone/core/LinphoneCallLogImpl.java
@@ -26,11 +26,14 @@ class LinphoneCallLogImpl implements LinphoneCallLog {
 	private native long getFrom(long nativePtr);
 	private native long getTo(long nativePtr);
 	private native boolean isIncoming(long nativePtr);
+	private native int getStatus(long nativePtr);
+	private native String getStartDate(long nativePtr);
+	private native int getCallDuration(long nativePtr);
+	
 	LinphoneCallLogImpl(long aNativePtr)  {
 		nativePtr = aNativePtr;
 	}
 	
-	
 	public CallDirection getDirection() {
 		return isIncoming(nativePtr)?CallDirection.Incoming:CallDirection.Outgoing;
 	}
@@ -43,7 +46,18 @@ class LinphoneCallLogImpl implements LinphoneCallLog {
 		return new LinphoneAddressImpl(getTo(nativePtr));
 	}
 	public CallStatus getStatus() {
-		throw new RuntimeException("not implemented yet");
+		return LinphoneCallLog.CallStatus.fromInt(getStatus(nativePtr));
 	}
 
+	public long getNativePtr() {
+		return nativePtr;
+	}
+
+	public String getStartDate() {
+		return getStartDate(nativePtr);
+	}
+
+	public int getCallDuration() {
+		return getCallDuration(nativePtr);
+	}
 }
diff --git a/src/org/linphone/core/LinphoneCoreImpl.java b/src/org/linphone/core/LinphoneCoreImpl.java
index 54f6383a0..75e885253 100644
--- a/src/org/linphone/core/LinphoneCoreImpl.java
+++ b/src/org/linphone/core/LinphoneCoreImpl.java
@@ -20,12 +20,10 @@ package org.linphone.core;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Vector;
 
 
 class LinphoneCoreImpl implements LinphoneCore {
 
-	@SuppressWarnings("unused")
 	private final  LinphoneCoreListener mListener; //to make sure to keep a reference on this object
 	private long nativePtr = 0;
 	private native long newLinphoneCore(LinphoneCoreListener listener,String userConfig,String factoryConfig,Object  userdata);
@@ -108,7 +106,9 @@ class LinphoneCoreImpl implements LinphoneCore {
 	private native void setMediaEncryption(long nativePtr, int menc);
 	private native boolean isMediaEncryptionMandatory(long nativePtr);
 	private native void setMediaEncryptionMandatory(long nativePtr, boolean yesno);
-	
+	private native void removeCallLog(long nativePtr, long callLogPtr);
+	private native int getMissedCallsCount(long nativePtr);
+	private native void resetMissedCallsCount(long nativePtr);
 	
 	LinphoneCoreImpl(LinphoneCoreListener listener, File userConfig,File factoryConfig,Object  userdata) throws IOException {
 		mListener=listener;
@@ -704,4 +704,16 @@ class LinphoneCoreImpl implements LinphoneCore {
 	{
 		setCpuCountNative(count);
 	}
+	
+	public int getMissedCallsCount() {
+		return getMissedCallsCount(nativePtr);
+	}
+	
+	public void removeCallLog(LinphoneCallLog log) {
+		removeCallLog(nativePtr, log.getNativePtr());
+	}
+
+	public void resetMissedCallsCount() {
+		resetMissedCallsCount(nativePtr);
+	}
 }
diff --git a/src/org/linphone/core/tutorials/AndroidTutorialNotifier.java b/src/org/linphone/core/tutorials/AndroidTutorialNotifier.java
deleted file mode 100644
index 7721f7dc1..000000000
--- a/src/org/linphone/core/tutorials/AndroidTutorialNotifier.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-AndroidTutorialNotifier.java
-Copyright (C) 2010  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.core.tutorials;
-
-import android.os.Handler;
-import android.widget.TextView;
-
-/**
- * Write notifications to a TextView widget.
- * This is an helper class, not a test activity.
- * 
- * @author Guillaume Beraudo
- *
- */
-class AndroidTutorialNotifier extends TutorialNotifier {
-
-	private Handler mHandler;
-	private TextView outputTextView;
-	
-	public AndroidTutorialNotifier(Handler mHandler, final TextView outputTextView) {
-		this.mHandler = mHandler;
-		this.outputTextView = outputTextView;
-	}
-	
-	
-	@Override
-	public void notify(final String s) {
-		mHandler.post(new Runnable() {
-			public void run() {
-				outputTextView.setText(s + "\n" + outputTextView.getText());
-			}
-		});
-	}
-}
diff --git a/src/org/linphone/core/tutorials/TutorialBuddyStatusActivity.java b/src/org/linphone/core/tutorials/TutorialBuddyStatusActivity.java
deleted file mode 100644
index 1bf4f981f..000000000
--- a/src/org/linphone/core/tutorials/TutorialBuddyStatusActivity.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
-TutorialBuddyStatusActivity.java
-Copyright (C) 2010  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.core.tutorials;
-
-import org.linphone.R;
-import org.linphone.core.LinphoneCoreException;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.os.Handler;
-import android.view.View;
-import android.widget.Button;
-import android.widget.TextView;
-
-/**
- * Activity for displaying and starting the BuddyStatus example on Android phone.
- *
- * @author Guillaume Beraudo
- *
- */
-public class TutorialBuddyStatusActivity extends Activity {
-
-	private static final String defaultSipAddress = "sip:";
-	private TextView sipAddressWidget;
-	private TextView mySipAddressWidget;
-	private TextView mySipPasswordWidget;
-	
-	private TutorialBuddyStatus tutorial;
-	private Handler mHandler =  new Handler() ;
-	private Button buttonCall;
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.hello_world);
-		sipAddressWidget = (TextView) findViewById(R.id.AddressId);
-		sipAddressWidget.setText(defaultSipAddress);
-
-		mySipAddressWidget = (TextView) findViewById(R.id.MyAddressId);
-		mySipAddressWidget.setVisibility(View.VISIBLE);
-		mySipPasswordWidget = (TextView) findViewById(R.id.Password);
-		mySipPasswordWidget.setVisibility(TextView.VISIBLE);
-		
-		
-		// Output text to the outputText widget
-		final TextView outputText = (TextView) findViewById(R.id.OutputText);
-		final TutorialNotifier notifier = new AndroidTutorialNotifier(mHandler, outputText);
-
-		
-		// Create BuddyStatus object
-		tutorial = new TutorialBuddyStatus(notifier);
-
-		
-		
-		// Assign call action to call button
-		buttonCall = (Button) findViewById(R.id.CallButton);
-		buttonCall.setOnClickListener(new View.OnClickListener() {
-			public void onClick(View v) {
-				TutorialLaunchingThread thread = new TutorialLaunchingThread();
-				buttonCall.setEnabled(false);
-				thread.start();
-			}
-		});
-
-		// Assign stop action to stop button
-		Button buttonStop = (Button) findViewById(R.id.ButtonStop);
-		buttonStop.setOnClickListener(new View.OnClickListener() {
-			public void onClick(View v) {
-				tutorial.stopMainLoop();
-			}
-		});
-	}
-	
-	
-	private class TutorialLaunchingThread extends Thread {
-		@Override
-		public void run() {
-			super.run();
-			try {
-				String myIdentity = mySipAddressWidget.getText().length()>0?mySipAddressWidget.getText().toString():null;
-				String myPassword = mySipPasswordWidget.getText().length()>0?mySipPasswordWidget.getText().toString():null;
-				tutorial.launchTutorial(sipAddressWidget.getText().toString(), myIdentity, myPassword);
-				mHandler.post(new Runnable() {
-					public void run() {
-						buttonCall.setEnabled(true);
-					}
-				});
-			} catch (LinphoneCoreException e) {
-				e.printStackTrace();
-			}
-		}
-	}
-}
diff --git a/src/org/linphone/core/tutorials/TutorialChatRoomActivity.java b/src/org/linphone/core/tutorials/TutorialChatRoomActivity.java
deleted file mode 100644
index f7dab4ce7..000000000
--- a/src/org/linphone/core/tutorials/TutorialChatRoomActivity.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-TutorialChatRoomActivity.java
-Copyright (C) 2010  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.core.tutorials;
-
-import org.linphone.R;
-import org.linphone.core.LinphoneCoreException;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.os.Handler;
-import android.view.View;
-import android.widget.Button;
-import android.widget.TextView;
-
-/**
- * Activity for displaying and starting the chatroom example on Android phone.
- *
- * @author Guillaume Beraudo
- *
- */
-public class TutorialChatRoomActivity extends Activity {
-
-	private static final String defaultSipAddress = "sip:";
-	private TextView sipAddressWidget;
-	private TutorialChatRoom tutorial;
-	private Handler mHandler =  new Handler() ;
-	private Button buttonCall;
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.hello_world);
-		sipAddressWidget = (TextView) findViewById(R.id.AddressId);
-		sipAddressWidget.setText(defaultSipAddress);
-
-		// Output text to the outputText widget
-		final TextView outputText = (TextView) findViewById(R.id.OutputText);
-		final TutorialNotifier notifier = new AndroidTutorialNotifier(mHandler, outputText);
-
-		
-		// Create HelloWorld object
-		tutorial = new TutorialChatRoom(notifier);
-
-		
-		
-		// Assign call action to call button
-		buttonCall = (Button) findViewById(R.id.CallButton);
-		buttonCall.setOnClickListener(new View.OnClickListener() {
-			public void onClick(View v) {
-				TutorialLaunchingThread thread = new TutorialLaunchingThread();
-				buttonCall.setEnabled(false);
-				thread.start();
-			}
-		});
-
-		// Assign stop action to stop button
-		Button buttonStop = (Button) findViewById(R.id.ButtonStop);
-		buttonStop.setOnClickListener(new View.OnClickListener() {
-			public void onClick(View v) {
-				tutorial.stopMainLoop();
-			}
-		});
-	}
-	
-	
-	private class TutorialLaunchingThread extends Thread {
-		@Override
-		public void run() {
-			super.run();
-			try {
-				tutorial.launchTutorial(sipAddressWidget.getText().toString());
-				mHandler.post(new Runnable() {
-					public void run() {
-						buttonCall.setEnabled(true);
-					}
-				});
-			} catch (LinphoneCoreException e) {
-				e.printStackTrace();
-			}
-		}
-	}
-}
diff --git a/src/org/linphone/core/tutorials/TutorialHelloWorldActivity.java b/src/org/linphone/core/tutorials/TutorialHelloWorldActivity.java
deleted file mode 100644
index 60bd872c7..000000000
--- a/src/org/linphone/core/tutorials/TutorialHelloWorldActivity.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-TutorialHelloWorldActivity.java
-Copyright (C) 2010  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.core.tutorials;
-
-import org.linphone.R;
-import org.linphone.core.LinphoneCoreException;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.os.Handler;
-import android.view.View;
-import android.widget.Button;
-import android.widget.TextView;
-
-/**
- * Activity for displaying and starting the HelloWorld example on Android phone.
- *
- * @author Guillaume Beraudo
- *
- */
-public class TutorialHelloWorldActivity extends Activity {
-
-	private static final String defaultSipAddress = "sip:";
-	private TextView sipAddressWidget;
-	private TutorialHelloWorld tutorial;
-	private Handler mHandler =  new Handler() ;
-	private Button buttonCall;
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.hello_world);
-		sipAddressWidget = (TextView) findViewById(R.id.AddressId);
-		sipAddressWidget.setText(defaultSipAddress);
-
-		// Output text to the outputText widget
-		final TextView outputText = (TextView) findViewById(R.id.OutputText);
-		final TutorialNotifier notifier = new AndroidTutorialNotifier(mHandler, outputText);
-
-		
-		// Create HelloWorld object
-		tutorial = new TutorialHelloWorld(notifier);
-
-		
-		
-		// Assign call action to call button
-		buttonCall = (Button) findViewById(R.id.CallButton);
-		buttonCall.setOnClickListener(new View.OnClickListener() {
-			public void onClick(View v) {
-				TutorialLaunchingThread thread = new TutorialLaunchingThread();
-				buttonCall.setEnabled(false);
-				thread.start();
-			}
-		});
-
-		// Assign stop action to stop button
-		Button buttonStop = (Button) findViewById(R.id.ButtonStop);
-		buttonStop.setOnClickListener(new View.OnClickListener() {
-			public void onClick(View v) {
-				tutorial.stopMainLoop();
-			}
-		});
-	}
-	
-	
-	private class TutorialLaunchingThread extends Thread {
-		@Override
-		public void run() {
-			super.run();
-			try {
-				tutorial.launchTutorial(sipAddressWidget.getText().toString());
-				mHandler.post(new Runnable() {
-					public void run() {
-						buttonCall.setEnabled(true);
-					}
-				});
-			} catch (LinphoneCoreException e) {
-				e.printStackTrace();
-			}
-		}
-	}
-}
diff --git a/src/org/linphone/core/tutorials/TutorialRegistrationActivity.java b/src/org/linphone/core/tutorials/TutorialRegistrationActivity.java
deleted file mode 100644
index 94670480c..000000000
--- a/src/org/linphone/core/tutorials/TutorialRegistrationActivity.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-TutorialRegistrationActivity.java
-Copyright (C) 2010  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.core.tutorials;
-
-import org.linphone.R;
-import org.linphone.core.LinphoneCoreException;
-
-import android.os.Bundle;
-import android.os.Handler;
-import android.view.View;
-import android.widget.Button;
-import android.widget.TextView;
-
-/**
- * Activity for displaying and starting the registration example on Android phone.
- * 
- * @author Guillaume Beraudo
- *
- */
-public class TutorialRegistrationActivity extends TutorialHelloWorldActivity {
-
-	private static final String defaultSipAddress = "sip:";
-	private static final String defaultSipPassword = "";
-	private TextView sipAddressWidget;
-	private TextView sipPasswordWidget;
-	private TutorialRegistration tutorial;
-	private Button buttonCall;
-	private Handler mHandler =  new Handler();
-	private TextView outputText;
-
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.hello_world);
-		sipAddressWidget = (TextView) findViewById(R.id.AddressId);
-		sipAddressWidget.setText(defaultSipAddress);
-		sipPasswordWidget = (TextView) findViewById(R.id.Password);
-		sipPasswordWidget.setVisibility(TextView.VISIBLE);
-		sipPasswordWidget.setText(defaultSipPassword);
-
-		// Output text to the outputText widget
-		outputText = (TextView) findViewById(R.id.OutputText);
-		final TutorialNotifier notifier = new AndroidTutorialNotifier(mHandler, outputText);
-
-		
-		// Create Tutorial object
-		tutorial = new TutorialRegistration(notifier);
-
-		
-		
-		// Assign call action to call button
-		buttonCall = (Button) findViewById(R.id.CallButton);
-		buttonCall.setText("Register");
-		buttonCall.setOnClickListener(new View.OnClickListener() {
-			public void onClick(View v) {
-				TutorialLaunchingThread thread = new TutorialLaunchingThread();
-				buttonCall.setEnabled(false);
-				thread.start();
-			}
-		});
-
-
-		Button buttonStop = (Button) findViewById(R.id.ButtonStop);
-		buttonStop.setOnClickListener(new View.OnClickListener() {
-			public void onClick(View v) {
-				tutorial.stopMainLoop();
-			}
-		});
-	}
-	
-	
-	private class TutorialLaunchingThread extends Thread {
-		@Override
-		public void run() {
-			super.run();
-			try {
-				tutorial.launchTutorial(
-						sipAddressWidget.getText().toString(),
-						sipPasswordWidget.getText().toString());
-			} catch (LinphoneCoreException e) {
-				e.printStackTrace();
-				outputText.setText(e.getMessage() +"\n"+outputText.getText());
-			}
-		}
-	}
-}
diff --git a/src/org/linphone/ui/AddVideoButton.java b/src/org/linphone/ui/AddVideoButton.java
deleted file mode 100644
index 47d6a1ed9..000000000
--- a/src/org/linphone/ui/AddVideoButton.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-AddVideoButton.java
-Copyright (C) 2010  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.ui;
-
-import org.linphone.LinphoneActivity;
-import org.linphone.LinphoneManager;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.ImageButton;
-
-/**
- * @author Guillaume Beraudo
- *
- */
-public class AddVideoButton extends ImageButton implements OnClickListener {
-
-	public AddVideoButton(Context context, AttributeSet attrs) {
-		super(context, attrs);
-		setOnClickListener(this);
-	}
-
-	public void onClick(View v) {
-		if (!LinphoneManager.getInstance().addVideo()) {
-			LinphoneActivity.instance().startVideoActivity(LinphoneManager.getLc().getCurrentCall(), 0);
-		}
-	}
-}
diff --git a/src/org/linphone/ui/AddressText.java b/src/org/linphone/ui/AddressText.java
index 5f151326c..4ea908130 100644
--- a/src/org/linphone/ui/AddressText.java
+++ b/src/org/linphone/ui/AddressText.java
@@ -62,7 +62,7 @@ public class AddressText extends EditText implements AddressType {
 	protected void onTextChanged(CharSequence text, int start, int before,
 			int after) {
 		clearDisplayedName();
-		pictureUri=null;
+		pictureUri = null;
 		super.onTextChanged(text, start, before, after);
 	}
 
diff --git a/src/org/linphone/ui/CallButton.java b/src/org/linphone/ui/CallButton.java
index f0223f0f7..5da1bb8bb 100644
--- a/src/org/linphone/ui/CallButton.java
+++ b/src/org/linphone/ui/CallButton.java
@@ -26,14 +26,13 @@ import android.content.Context;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.View.OnClickListener;
-import android.widget.ImageButton;
+import android.widget.ImageView;
 import android.widget.Toast;
 
 /**
  * @author Guillaume Beraudo
- *
  */
-public class CallButton extends ImageButton implements OnClickListener, AddressAware {
+public class CallButton extends ImageView implements OnClickListener, AddressAware {
 
 	private AddressText mAddress;
 	public void setAddressWidget(AddressText a) {mAddress = a;}
diff --git a/src/org/linphone/ui/CameraView.java b/src/org/linphone/ui/CameraView.java
deleted file mode 100644
index 2f2f5b781..000000000
--- a/src/org/linphone/ui/CameraView.java
+++ /dev/null
@@ -1,195 +0,0 @@
-package org.linphone.ui;
-
-import java.io.IOException;
-import java.util.List;
-
-import android.content.Context;
-import android.hardware.Camera;
-import android.hardware.Camera.CameraInfo;
-import android.hardware.Camera.Size;
-import android.util.AttributeSet;
-import android.view.Display;
-import android.view.Surface;
-import android.view.SurfaceHolder;
-import android.view.SurfaceView;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.WindowManager;
-
-public class CameraView extends ViewGroup implements SurfaceHolder.Callback {
-    
-	public CameraView(Context context, AttributeSet attrs) {
-		super(context, attrs);
-		
-		mSurfaceView = new SurfaceView(context);
-        addView(mSurfaceView);
-
-        mHolder = mSurfaceView.getHolder();
-        mHolder.addCallback(this);
-        mHolder.setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
-	}
-
-    CameraView(Context context) {
-        super(context);
-
-        mSurfaceView = new SurfaceView(context);
-        addView(mSurfaceView);
-
-        mHolder = mSurfaceView.getHolder();
-        mHolder.addCallback(this);
-        mHolder.setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
-    }
-
-	SurfaceView mSurfaceView;
-    SurfaceHolder mHolder;
-    Size mPreviewSize;
-    List<Size> mSupportedSizes;
-    Camera mCamera;
-    int mCameraId;
-
-    public void setCamera(Camera camera, int id) {
-        mCamera = camera;
-        mCameraId = id;
-        if (mCamera != null) {
-            mSupportedSizes = mCamera.getParameters().getSupportedPreviewSizes();
-            requestLayout();
-        }
-    }
-
-    public void switchCamera(Camera camera, int id) {
-       setCamera(camera, id);
-       try {
-           camera.setPreviewDisplay(mHolder);
-       } catch (IOException exception) {
-    	   
-       }
-       Camera.Parameters parameters = camera.getParameters();
-       parameters.setPreviewSize(mPreviewSize.width, mPreviewSize.height);
-       requestLayout();
-
-       camera.setParameters(parameters);
-    }
-
-    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        int width = resolveSize(getSuggestedMinimumWidth(), widthMeasureSpec);;
-        int height = resolveSize(getSuggestedMinimumHeight(), heightMeasureSpec);;
-        setMeasuredDimension(width, height);
-
-        if (mSupportedSizes != null) {
-        	mPreviewSize = getOptimalPreviewSize(mSupportedSizes, width, height);
-        }
-        
-        Display display = ((WindowManager) getContext().getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
-    	if (display.getRotation() == Surface.ROTATION_90 || display.getRotation() == Surface.ROTATION_270) {
-    		Size tempSize = mPreviewSize;
-    		mPreviewSize.width = tempSize.height;
-    		mPreviewSize.height = tempSize.width;
-    	}
-    }
-
-    protected void onLayout(boolean changed, int l, int t, int r, int b) {
-        if (changed && getChildCount() > 0) {
-            final View child = getChildAt(0);
-
-            final int width = r - l;
-            final int height = b - t;
-
-            int previewWidth = width;
-            int previewHeight = height;
-            if (mPreviewSize != null) {
-                previewWidth = mPreviewSize.width;
-                previewHeight = mPreviewSize.height;
-            }
-
-            // Center the surface view
-            if (width * previewHeight > height * previewWidth) {
-                final int scaledChildWidth = previewWidth * height / previewHeight;
-                child.layout((width - scaledChildWidth) / 2, 0,
-                        (width + scaledChildWidth) / 2, height);
-            } else {
-                final int scaledChildHeight = previewHeight * width / previewWidth;
-                child.layout(0, (height - scaledChildHeight) / 2,
-                        width, (height + scaledChildHeight) / 2);
-            }
-        }
-    }
-
-    public void surfaceCreated(SurfaceHolder holder) {
-        try {
-            if (mCamera != null) {
-                mCamera.setPreviewDisplay(holder);
-            }
-        } catch (IOException exception) {
-        	
-        }
-    }
-
-    public void surfaceDestroyed(SurfaceHolder holder) {
-        if (mCamera != null) {
-            mCamera.stopPreview();
-        }
-    }
-
-    private Size getOptimalPreviewSize(List<Size> sizes, int w, int h) {
-        final double ASPECT_TOLERANCE = 0.1;
-        double targetRatio = (double) w / h;
-        if (sizes == null) return null;
-
-        Size optimalSize = null;
-        double minDiff = Double.MAX_VALUE;
-
-        int targetHeight = h;
-
-        for (Size size : sizes) {
-            double ratio = (double) size.width / size.height;
-            if (Math.abs(ratio - targetRatio) > ASPECT_TOLERANCE) continue;
-            if (Math.abs(size.height - targetHeight) < minDiff) {
-                optimalSize = size;
-                minDiff = Math.abs(size.height - targetHeight);
-            }
-        }
-
-        if (optimalSize == null) {
-            minDiff = Double.MAX_VALUE;
-            for (Size size : sizes) {
-                if (Math.abs(size.height - targetHeight) < minDiff) {
-                    optimalSize = size;
-                    minDiff = Math.abs(size.height - targetHeight);
-                }
-            }
-        }
-        return optimalSize;
-    }
-
-    public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) {
-    	if (mCamera == null)
-    		return;
-    	
-    	mCamera.stopPreview();
-    	Display display = ((WindowManager) getContext().getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
-        Camera.Parameters parameters = mCamera.getParameters();
-        
-        int rotation = 0;
-        if(display.getRotation() == Surface.ROTATION_90) {
-            rotation = 90;
-        }
-        else if(display.getRotation() == Surface.ROTATION_270) {
-            rotation = 270;
-        }
-        else if (display.getRotation() == Surface.ROTATION_180) {
-            rotation = 180;
-        }
-        
-        CameraInfo cameraInfo = new CameraInfo();
-        Camera.getCameraInfo(mCameraId, cameraInfo);
-        if (cameraInfo.facing == CameraInfo.CAMERA_FACING_FRONT) {
-        	mCamera.setDisplayOrientation((cameraInfo.orientation - rotation + 360) % 360);
-	    } else {
-	    	mCamera.setDisplayOrientation((cameraInfo.orientation + rotation) % 360);
-	    }
-        
-        requestLayout();        
-        mCamera.setParameters(parameters);
-        mCamera.startPreview();
-    }
-}
\ No newline at end of file
diff --git a/src/org/linphone/ui/Digit.java b/src/org/linphone/ui/Digit.java
index 83e74661a..943ebb70a 100644
--- a/src/org/linphone/ui/Digit.java
+++ b/src/org/linphone/ui/Digit.java
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 package org.linphone.ui;
 
-import org.linphone.DialerActivity;
+import org.linphone.DialerFragment;
 import org.linphone.LinphoneManager;
 import org.linphone.LinphoneService;
 import org.linphone.R;
@@ -104,7 +104,7 @@ public class Digit extends Button implements AddressAware {
 				LinphoneCore lc = LinphoneManager.getLc();
 				lc.stopDtmf();
 				mIsDtmfStarted =false;
-				if (lc.isIncall() && !DialerActivity.instance().mVisible) {
+				if (lc.isIncall() && !DialerFragment.instance().mVisible) {
 					lc.sendDtmf(mKeyCode.charAt(0));
 				}
 			}
diff --git a/src/org/linphone/ui/EraseButton.java b/src/org/linphone/ui/EraseButton.java
index 289b8fa50..375c797e1 100644
--- a/src/org/linphone/ui/EraseButton.java
+++ b/src/org/linphone/ui/EraseButton.java
@@ -23,9 +23,9 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.View.OnLongClickListener;
-import android.widget.Button;
+import android.widget.ImageView;
 
-public class EraseButton extends Button implements AddressAware, OnClickListener, OnLongClickListener{
+public class EraseButton extends ImageView implements AddressAware, OnClickListener, OnLongClickListener{
 
 	private AddressText address;
 
diff --git a/src/org/linphone/ui/HangCallButton.java b/src/org/linphone/ui/HangCallButton.java
deleted file mode 100644
index 9194c844d..000000000
--- a/src/org/linphone/ui/HangCallButton.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-HangCallButton.java
-Copyright (C) 2010  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.ui;
-
-import org.linphone.LinphoneManager;
-import org.linphone.core.LinphoneCore;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.ImageButton;
-
-public class HangCallButton extends ImageButton implements OnClickListener {
-
-	private boolean terminateAllCalls;
-	public void setTerminateAllCalls(boolean all) {terminateAllCalls = all;}
-
-	private OnClickListener externalClickListener;
-	public void setExternalClickListener(OnClickListener e) {externalClickListener = e;}
-
-	public HangCallButton(Context context, AttributeSet attrs) {
-		super(context, attrs);
-		setOnClickListener(this);
-	}
-
-	public void onClick(View v) {
-		LinphoneCore lc =  LinphoneManager.getLc();
-		if (terminateAllCalls) {
-			lc.terminateAllCalls();
-		} else {
-			lc.terminateCall(lc.getCurrentCall());
-		}
-
-		if (externalClickListener != null) externalClickListener.onClick(v);
-	}
-}
diff --git a/src/org/linphone/ui/IncallTimer.java b/src/org/linphone/ui/IncallTimer.java
deleted file mode 100644
index 34f693be1..000000000
--- a/src/org/linphone/ui/IncallTimer.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-IncallTimer.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.ui;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.widget.TextView;
-
-/**
- * Widget displaying a time
- * @author Guillaume Beraudo
- *
- */
-public class IncallTimer extends TextView {
-
-	public IncallTimer(Context context, AttributeSet attrs, int defStyle) {
-		super(context, attrs, defStyle);
-	}
-
-	public IncallTimer(Context context, AttributeSet attrs) {
-		super(context, attrs);
-	}
-
-	public IncallTimer(Context context) {
-		super(context);
-	}
-
-
-	@Override
-	public void setText(CharSequence text, BufferType type) {
-		try {
-			int seconds = Integer.parseInt(text.toString());
-			super.setText(formatTime(seconds), type);
-		} catch (Throwable e) {
-			super.setText(text, type);
-		}
-	}
-	
-	protected String formatTime(final int seconds) {
-		String time = String.format("%02d:%02d",
-				(seconds / 60) % 60,
-				seconds % 60);
-	
-		int hours = seconds / 3600;
-		if (hours != 0) {
-			return hours + ":" + time;
-		} else {
-			return time;
-		}
-	}
-
-	public void setDuration(int duration) {
-		super.setText(formatTime(duration));
-	}
-}
diff --git a/src/org/linphone/ui/LockableSlidingDrawer.java b/src/org/linphone/ui/LockableSlidingDrawer.java
deleted file mode 100644
index 07460fc99..000000000
--- a/src/org/linphone/ui/LockableSlidingDrawer.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.linphone.ui;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.widget.SlidingDrawer;
-
-public class LockableSlidingDrawer extends SlidingDrawer {
-    private boolean locked = false;
-    
-    public LockableSlidingDrawer(Context context) {
-        super(context, null, 0);
-    }
-    
-    public LockableSlidingDrawer(Context context, AttributeSet attrs) {
-        super(context, attrs, 0);
-    }
-    
-    public LockableSlidingDrawer(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-    }
-    
-    @Override
-    public boolean onTouchEvent(MotionEvent event)  {
-	    if (this.locked) {
-	    	return false;
-	    }
-	    
-	    return super.onTouchEvent(event);
-    }
-    
-    public void lock() {
-        this.locked = true;
-    }
-}
\ No newline at end of file
diff --git a/src/org/linphone/ui/MuteMicButton.java b/src/org/linphone/ui/MuteMicButton.java
deleted file mode 100644
index 42c35bdd0..000000000
--- a/src/org/linphone/ui/MuteMicButton.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-SpeakerButton.java
-Copyright (C) 2010  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.ui;
-
-import org.linphone.LinphoneManager;
-import org.linphone.ui.ToggleImageButton.OnCheckedChangeListener;
-
-import android.content.Context;
-import android.util.AttributeSet;
-
-/**
- * @author Guillaume Beraudo
- *
- */
-public class MuteMicButton extends ToggleImageButton implements OnCheckedChangeListener {
-
-	public MuteMicButton(Context context, AttributeSet attrs) {
-		super(context, attrs);
-		setOnCheckedChangeListener(this);
-	}
-
-
-	public boolean isMicMuted() {
-		return isChecked();
-	}
-
-	public void setMicMuted(boolean state) {
-		if (state != isChecked())
-			setChecked(state);
-	}
-
-
-	public void onCheckedChanged(ToggleImageButton button, boolean checked) {
-		LinphoneManager.getLc().muteMic(checked);
-	}
-}
diff --git a/src/org/linphone/ui/SlidingTab.java b/src/org/linphone/ui/SlidingTab.java
index c58670e39..3ac07b65a 100644
--- a/src/org/linphone/ui/SlidingTab.java
+++ b/src/org/linphone/ui/SlidingTab.java
@@ -33,12 +33,12 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.AlphaAnimation;
 import android.view.animation.Animation;
+import android.view.animation.Animation.AnimationListener;
 import android.view.animation.LinearInterpolator;
 import android.view.animation.TranslateAnimation;
-import android.view.animation.Animation.AnimationListener;
 import android.widget.ImageView;
-import android.widget.TextView;
 import android.widget.ImageView.ScaleType;
+import android.widget.TextView;
 
 /**
  * A special widget containing two Sliders and a threshold for each.  Moving either slider beyond
@@ -52,7 +52,6 @@ import android.widget.ImageView.ScaleType;
 public class SlidingTab extends ViewGroup {
     private static final String LOG_TAG = "SlidingTab";
     private static final int HORIZONTAL = 0; // as defined in attrs.xml
-    private static final int VERTICAL = 1;
 
     // TODO: Make these configurable
     private static final float THRESHOLD = 2.0f / 3.0f;
@@ -450,13 +449,13 @@ public class SlidingTab extends ViewGroup {
         mOrientation = a.getInt(org.linphone.R.styleable.SlidingTab_orientation, HORIZONTAL);
         a.recycle();
         mLeftSlider = new Slider(this,
-                R.drawable.startcall_green,
+                R.drawable.startcall,
                 R.drawable.jog_tab_left_answer,
                 R.drawable.jog_tab_bar_left_answer,
                 R.drawable.jog_tab_target_green
                 );
         mRightSlider = new Slider(this,
-                R.drawable.stopcall_red,
+                R.drawable.endcall,
                 R.drawable.jog_tab_right_decline,
                 R.drawable.jog_tab_bar_right_decline,
                 R.drawable.jog_tab_target_red
diff --git a/src/org/linphone/ui/SpeakerButton.java b/src/org/linphone/ui/SpeakerButton.java
deleted file mode 100644
index 35d2beb1b..000000000
--- a/src/org/linphone/ui/SpeakerButton.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-SpeakerButton.java
-Copyright (C) 2010  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.ui;
-
-import org.linphone.LinphoneManager;
-import org.linphone.ui.ToggleImageButton.OnCheckedChangeListener;
-
-import android.content.Context;
-import android.util.AttributeSet;
-
-/**
- * @author Guillaume Beraudo
- *
- */
-public class SpeakerButton extends ToggleImageButton implements OnCheckedChangeListener {
-
-	public SpeakerButton(Context context, AttributeSet attrs) {
-		super(context, attrs);
-		setOnCheckedChangeListener(this);
-	}
-
-
-	public boolean isSpeakerOn() {
-		return isChecked();
-	}
-
-	public void setSpeakerOn(boolean state) {
-		if (state != isChecked())
-			setChecked(state);
-	}
-
-
-	public void onCheckedChanged(ToggleImageButton button, boolean checked) {
-		if (checked) {
-			LinphoneManager.getInstance().routeAudioToSpeaker();
-		} else {
-			LinphoneManager.getInstance().routeAudioToReceiver();
-		}
-	}
-
-
-}
diff --git a/src/org/linphone/ui/ToggleImageButton.java b/src/org/linphone/ui/ToggleImageButton.java
deleted file mode 100644
index 03899abf8..000000000
--- a/src/org/linphone/ui/ToggleImageButton.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
-ToggleImageButton.java
-Copyright (C) 2010  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.ui;
-
-
-import org.linphone.R;
-
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.Color;
-import android.graphics.drawable.Drawable;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Checkable;
-import android.widget.ImageButton;
-
-/**
- * Image button storing a checked state to display alternating drawables.
- * The "checked" drawable is displayed when button is down / checked.
- * The "unchecked" drawable is displayed when button is up / unchecked.
- *
- * @author Guillaume Beraudo
- *
- */
-public class ToggleImageButton extends ImageButton implements Checkable, OnClickListener {
-	private boolean checked;
-	private Drawable stateChecked;
-	private Drawable stateUnChecked;
-	private boolean drawablesForBackground;
-	private OnCheckedChangeListener onCheckedChangeListener;
-
-	public ToggleImageButton(Context context, AttributeSet attrs) {
-		super(context, attrs);
-		
-		TypedArray array = context.obtainStyledAttributes(attrs, R.styleable.ToggleImageButton);
-		stateChecked = getResources().getDrawable(array.getResourceId(R.styleable.ToggleImageButton_checked, -1));
-		stateUnChecked = getResources().getDrawable(array.getResourceId(R.styleable.ToggleImageButton_unchecked, -1));
-		drawablesForBackground = array.getBoolean(R.styleable.ToggleImageButton_bgdrawables, false);
-		setBackgroundColor(Color.TRANSPARENT);
-
-		setOnClickListener(this);
-		handleCheckChanged();
-	}
-
-
-
-	public void setChecked(boolean checked) {
-		this.checked = checked;
-		handleCheckChanged();
-	}
-	
-	public boolean isChecked() {
-		return checked;
-	}
-
-
-	private void handleCheckChanged() {
-		Drawable d = checked? stateChecked : stateUnChecked;
-		if (drawablesForBackground) {
-			setBackgroundDrawable(d);
-		} else {
-			setImageDrawable(d);
-		}
-		requestLayout();
-		invalidate();
-		if (onCheckedChangeListener != null) onCheckedChangeListener.onCheckedChanged(this, checked);
-	}
-	
-	
-	public void setOnCheckedChangeListener(OnCheckedChangeListener listener) {
-		onCheckedChangeListener = listener;
-	}
-	
-	public static interface OnCheckedChangeListener {
-		void onCheckedChanged(ToggleImageButton button, boolean checked);
-	}
-
-	public void onClick(View v) {
-		toggle();
-	}
-
-
-	@Override
-	public void toggle() {
-		setChecked(!isChecked());
-	}
-
-    @Override
-    public boolean performClick() {
-        toggle();
-        return super.performClick();
-    }
-}
diff --git a/src/org/mediastreamer2/test/Ring.java b/src/org/mediastreamer2/test/Ring.java
deleted file mode 100644
index 361534049..000000000
--- a/src/org/mediastreamer2/test/Ring.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-Ring.java
-Copyright (C) 2010  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.mediastreamer2.test;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-
-import org.linphone.R;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.util.Log;
-
-public class Ring extends Activity {
-	Thread mWorkerThread = new Thread("Worker Thread");
-	/** Called when the activity is first created. */
-
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.ring);
-		try {
-			try {
-				System.loadLibrary("ring");
-			} catch (UnsatisfiedLinkError e) {
-				Log.e("mediastreamer2", "cannot load libring.so, did you compile SDK with ndk-build RING=yes ", e);
-			}
-			final File lFileToPlay = getFileStreamPath("oldphone_mono.wav");
-			if (!lFileToPlay.exists()) {		
-				FileOutputStream lOutputStream = openFileOutput ("oldphone_mono.wav", 0);
-				InputStream lInputStream = getResources().openRawResource(R.raw.oldphone_mono);
-				int readByte;
-				while (( readByte = lInputStream.read())!=-1) {
-					lOutputStream.write(readByte);
-				}
-				lOutputStream.flush();
-				lOutputStream.close();
-				lInputStream.close();
-			} 
-			init();
-			mWorkerThread =  new Thread(new Runnable() {
-				public void run() {
-					play(lFileToPlay.getAbsolutePath());      
-					echo(44100); 
-				}
-
-			},"Worker Thread");
-			mWorkerThread.start();
-		} catch (Exception e) {
-			Log.e("ring","error",e); 
-		}
-	}
-	native void play(String file); 
-	native void echo(int freq);
-	native void init();
-}
-    
\ No newline at end of file
diff --git a/submodules/linphone b/submodules/linphone
index 23d589cec..80e4341e0 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 23d589cec01361b7c08528cd7433d5b01c0579bb
+Subproject commit 80e4341e05c2410d4b3e64ac8c2b997910ef7075