diff --git a/Classes/IncallViewController.m b/Classes/IncallViewController.m
index 625621f20..a5b991804 100644
--- a/Classes/IncallViewController.m
+++ b/Classes/IncallViewController.m
@@ -22,6 +22,7 @@
 #import "linphonecore.h"
 #include "LinphoneManager.h"
 #include "private.h"
+#import "ContactPickerDelegate.h"Òß
 
 @implementation IncallViewController
 
@@ -390,7 +391,7 @@ int callCount(LinphoneCore* lc) {
 	} else if (sender == contacts) {
 		// start people picker
 		myPeoplePickerController = [[[ABPeoplePickerNavigationController alloc] init] autorelease];
-		[myPeoplePickerController setPeoplePickerDelegate:self];
+		[myPeoplePickerController setPeoplePickerDelegate:[[ContactPickerDelegate alloc] init] /*self*/];
 		
 		[self presentModalViewController: myPeoplePickerController animated:true]; 
 	} else if (sender == close) {
diff --git a/Classes/PhoneViewController.m b/Classes/PhoneViewController.m
index a0e732f8a..fa1ccefe7 100644
--- a/Classes/PhoneViewController.m
+++ b/Classes/PhoneViewController.m
@@ -153,9 +153,16 @@
 	} //else keep previous
 	
 	[mDisplayName setText:displayName];
-	[callLarge setHidden:FALSE];
-	[callShort setHidden:TRUE];
-	[backToCallView setHidden:TRUE];
+    // disable call button if != Paused
+    if (linphone_core_get_calls_nb([LinphoneManager getLc]) == 0) {
+        [callLarge setHidden:FALSE];
+        [callShort setHidden:TRUE];
+        [backToCallView setHidden:TRUE];
+    } else {
+        [callLarge setHidden:TRUE];
+        [callShort setHidden:FALSE];
+        [backToCallView setHidden:FALSE];        
+    }
 
 	
 	if ([[NSUserDefaults standardUserDefaults] boolForKey:@"firstlogindone_preference" ] == true) {