diff --git a/Classes/ContactsViewController.h b/Classes/ContactsViewController.h
index a7a91c866..6e726ab41 100644
--- a/Classes/ContactsViewController.h
+++ b/Classes/ContactsViewController.h
@@ -75,7 +75,7 @@ typedef enum _ContactSelectionMode {
 
 @end
 
-@interface ContactsViewController : UIViewController<UICompositeViewDelegate,ABPeoplePickerNavigationControllerDelegate> {
+@interface ContactsViewController : UIViewController<UICompositeViewDelegate,ABPeoplePickerNavigationControllerDelegate,UISearchBarDelegate> {
     BOOL use_systemView;
 }
 
@@ -94,5 +94,4 @@ typedef enum _ContactSelectionMode {
 - (IBAction)onAddContactClick:(id)event;
 - (IBAction)onBackClick:(id)event;
 
-- (void)searchBar:(UISearchBar *)searchBar textDidChange:(NSString *)searchText;
 @end
diff --git a/Classes/ContactsViewController.m b/Classes/ContactsViewController.m
index c22804e5e..baf3edfac 100644
--- a/Classes/ContactsViewController.m
+++ b/Classes/ContactsViewController.m
@@ -348,6 +348,8 @@ static UICompositeViewDescription *compositeDescription = nil;
 	return false;
 }
 
+#pragma mark - searchBar delegate
+
 - (void)searchBar:(UISearchBar *)searchBar textDidChange:(NSString *)searchText {
 	// set searchbar text in uppercase here
 	// searchBar.text = [searchText uppercaseString];
@@ -356,6 +358,14 @@ static UICompositeViewDescription *compositeDescription = nil;
 	[tableController loadData];
 }
 
+- (void)searchBarTextDidEndEditing:(UISearchBar *)searchBar {
+    [searchBar setShowsCancelButton:FALSE animated:TRUE];
+}
+
+- (void)searchBarTextDidBeginEditing:(UISearchBar *)searchBar {
+    [searchBar setShowsCancelButton:TRUE animated:TRUE];    
+}
+
 - (void)viewDidUnload {
 	[self setToolBar:nil];
 	[super viewDidUnload];