diff --git a/Classes/ChatRoomViewController.m b/Classes/ChatRoomViewController.m
index a144d846c..3dfdfb7bb 100644
--- a/Classes/ChatRoomViewController.m
+++ b/Classes/ChatRoomViewController.m
@@ -73,7 +73,7 @@ static UICompositeViewDescription *compositeDescription = nil;
                                                                 content:@"ChatRoomViewController" 
                                                                stateBar:nil 
                                                         stateBarEnabled:false 
-                                                                 tabBar:@"UIMainBar" 
+                                                                 tabBar:/*@"UIMainBar"*/nil
                                                           tabBarEnabled:false /*to keep room for chat*/
                                                              fullscreen:false
                                                           landscapeMode:[LinphoneManager runningOnIpad]
@@ -167,11 +167,20 @@ static UICompositeViewDescription *compositeDescription = nil;
     
     NSString *displayName = nil;
     UIImage *image = nil;
-	LinphoneAddress* linphoneAddress =linphone_core_interpret_url([LinphoneManager getLc],[_remoteAddress cStringUsingEncoding: NSUTF8StringEncoding]);
-	if (linphoneAddress==NULL)
-		return ;
-	char *tmp=linphone_address_as_string_uri_only(linphoneAddress);
-	NSString *normalizedSipAddress=[NSString stringWithUTF8String:tmp];
+	LinphoneAddress* linphoneAddress = linphone_core_interpret_url([LinphoneManager getLc], [_remoteAddress UTF8String]);
+	if (linphoneAddress == NULL) {
+        [[PhoneMainView instance] popCurrentView];
+		UIAlertView* error = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Invalid SIP address",nil)
+														message:NSLocalizedString(@"Either configure a SIP proxy server from settings prior to send a message or use a valid SIP address (I.E sip:john@example.net)",nil)
+													   delegate:nil
+											  cancelButtonTitle:NSLocalizedString(@"Continue",nil)
+											  otherButtonTitles:nil];
+		[error show];
+		[error release];
+        return;
+    }
+	char *tmp = linphone_address_as_string_uri_only(linphoneAddress);
+	NSString *normalizedSipAddress = [NSString stringWithUTF8String:tmp];
 	ms_free(tmp);
 	
     ABRecordRef acontact = [[[LinphoneManager instance] fastAddressBook] getContact:normalizedSipAddress];
@@ -180,7 +189,8 @@ static UICompositeViewDescription *compositeDescription = nil;
         image = [FastAddressBook getContactImage:acontact thumbnail:true];
     }
 	[_remoteAddress release];
-    _remoteAddress =[normalizedSipAddress retain];
+    _remoteAddress = [normalizedSipAddress retain];
+    
     // Display name
     if(displayName == nil) {
         displayName = [NSString stringWithUTF8String:linphone_address_get_username(linphoneAddress)];
@@ -192,14 +202,15 @@ static UICompositeViewDescription *compositeDescription = nil;
         image = [UIImage imageNamed:@"avatar_unknown_small.png"];
     }
     [avatarImage setImage:image];
-	linphone_address_destroy(linphoneAddress);
+    
+    linphone_address_destroy(linphoneAddress);
 }
 
 static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState state,void* ud) {
-	ChatRoomViewController* thiz=(ChatRoomViewController*)ud;
+	ChatRoomViewController* thiz = (ChatRoomViewController*)ud;
 	ChatModel *chat = (ChatModel *)linphone_chat_message_get_user_data(msg); 
 	[LinphoneLogger log:LinphoneLoggerLog 
-				 format:@"Delivery status for [%@] is [%s]",chat.message,linphone_chat_message_state_to_string(state)];
+				 format:@"Delivery status for [%@] is [%s]", chat.message, linphone_chat_message_state_to_string(state)];
 	[chat setState:[NSNumber numberWithInt:state]];
 	[chat update];
 	[thiz.tableController updateChatEntry:chat];
@@ -215,10 +226,7 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta
         return FALSE;
     }
     if(chatRoom == NULL) {
-		
-
 		chatRoom = linphone_core_create_chat_room([LinphoneManager getLc], [_remoteAddress UTF8String]);
-		
     }
     
     // Save message in database
@@ -233,9 +241,9 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta
     [chat create];
     [tableController addChatEntry:chat];
     [chat release];
-    LinphoneChatMessage* msg = linphone_chat_room_create_message(chatRoom,[message UTF8String]);
-	linphone_chat_message_set_user_data(msg,chat);
-    linphone_chat_room_send_message2(chatRoom, msg,message_status,self);
+    LinphoneChatMessage* msg = linphone_chat_room_create_message(chatRoom, [message UTF8String]);
+	linphone_chat_message_set_user_data(msg, chat);
+    linphone_chat_room_send_message2(chatRoom, msg, message_status, self);
     return TRUE;
 }
 
@@ -302,7 +310,7 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta
 
 - (void)keyboardWillHide:(NSNotification *)notif {
     //CGRect beginFrame = [[[notif userInfo] objectForKey:UIKeyboardFrameBeginUserInfoKey] CGRectValue];
-    CGRect endFrame = [[[notif userInfo] objectForKey:UIKeyboardFrameEndUserInfoKey] CGRectValue];
+    //CGRect endFrame = [[[notif userInfo] objectForKey:UIKeyboardFrameEndUserInfoKey] CGRectValue];
     UIViewAnimationCurve curve = [[[notif userInfo] objectForKey:UIKeyboardAnimationCurveUserInfoKey] intValue];
     NSTimeInterval duration = [[[notif userInfo] objectForKey:UIKeyboardAnimationDurationUserInfoKey] doubleValue];
     [UIView beginAnimations:@"resize" context:nil];
@@ -310,16 +318,27 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta
     [UIView setAnimationCurve:curve];
     [UIView setAnimationBeginsFromCurrentState:TRUE];
     
-    // Move view
-    CGRect frame = [[self chatView/*view*/] frame];
-    frame.origin.y = frame.origin.y + endFrame.size.height /*0*/;
-    [[self /*view*/chatView] setFrame:frame];
+    // Resize chat view
+    {
+        CGRect chatFrame = [[self chatView] frame];
+        chatFrame.size.height = [[self view] frame].size.height - chatFrame.origin.y;
+        [[self chatView] setFrame:chatFrame];
+    }
     
-    // Resize table view
-    CGRect tableFrame = [tableController.view frame];
-    tableFrame.origin.y = [headerView frame].origin.y + [headerView frame].size.height;
-    tableFrame.size.height = [footerView frame].origin.y - tableFrame.origin.y;
-    [tableController.view setFrame:tableFrame];
+    // Move header view
+    {
+        CGRect headerFrame = [headerView frame];
+        headerFrame.origin.y = 0;
+        [headerView setFrame:headerFrame];
+    }
+    
+    // Resize & Move table view
+    {
+        CGRect tableFrame = [tableController.view frame];
+        tableFrame.origin.y = [headerView frame].origin.y + [headerView frame].size.height;
+        tableFrame.size.height = [footerView frame].origin.y - tableFrame.origin.y;
+        [tableController.view setFrame:tableFrame];
+    }
     
     [UIView commitAnimations];
 }
@@ -340,30 +359,36 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta
         endFrame.size.width = width;
     }
     
-    // Move view
+    // Resize chat view
     {
-        CGRect frame = [[self chatView/*view*/] frame];
-       // CGRect rect = [PhoneMainView instance].view.bounds;
-		
-       // CGPoint pos = {frame.size.width, frame.size.height};
-       // CGPoint gPos = [self.view convertPoint:pos toView:[UIApplication sharedApplication].keyWindow.rootViewController.view]; // Bypass IOS bug on landscape mode
-        frame.origin.y = /*(rect.size.height - gPos.y*/ frame.origin.y - endFrame.size.height;
-        if(frame.origin.y > 0) frame.origin.y = 0;
-        [[self chatView] setFrame:frame];
-    }
-    
-    // Resize table view
-    {
-        /*CGPoint pos = {0, 0};
-        CGPoint gPos = [[self.view superview] convertPoint:pos toView:self.view];*/
-        CGRect tableFrame = [tableController.view frame];
-        tableFrame.origin.y += endFrame.size.height - headerView.frame.size.height/*gPos.y*/;
-        tableFrame.size.height = tableFrame.size.height - endFrame.size.height+headerView.frame.size.height;
-        [tableController.view setFrame:tableFrame];
+        CGRect viewFrame = [[self view] frame];
+        CGRect rect = [PhoneMainView instance].view.bounds;
+        CGPoint pos = {viewFrame.size.width, viewFrame.size.height};
+        CGPoint gPos = [self.view convertPoint:pos toView:[UIApplication sharedApplication].keyWindow.rootViewController.view]; // Bypass IOS bug on landscape mode
+        float diff = (rect.size.height - gPos.y - endFrame.size.height);
+        if(diff > 0) diff = 0;
+        CGRect chatFrame = [[self chatView] frame];
+        chatFrame.size.height = viewFrame.size.height - chatFrame.origin.y + diff;
+        [[self chatView] setFrame:chatFrame];
     }
 
+    // Move header view
+    {
+        CGRect headerFrame = [headerView frame];
+        headerFrame.origin.y = -headerFrame.size.height;
+        [headerView setFrame:headerFrame];
+    }
+    
+    // Resize & Move table view
+    {
+        CGRect tableFrame = [tableController.view frame];
+        tableFrame.origin.y = [headerView frame].origin.y + [headerView frame].size.height;
+        tableFrame.size.height = [footerView frame].origin.y - tableFrame.origin.y;
+        [tableController.view setFrame:tableFrame];
+    }
+    
     // Scroll
-    int lastSection = [tableController.tableView numberOfSections] -1;
+    int lastSection = [tableController.tableView numberOfSections] - 1;
     if(lastSection >= 0) {
         int lastRow = [tableController.tableView numberOfRowsInSection:lastSection] - 1;
         if(lastRow >=0) {
diff --git a/Classes/ChatRoomViewController.xib b/Classes/ChatRoomViewController.xib
index fa18a7f31..83160fc92 100644
--- a/Classes/ChatRoomViewController.xib
+++ b/Classes/ChatRoomViewController.xib
@@ -3,23 +3,22 @@
 	<data>
 		<int key="IBDocument.SystemTarget">1296</int>
 		<string key="IBDocument.SystemVersion">11E53</string>
-		<string key="IBDocument.InterfaceBuilderVersion">2182</string>
+		<string key="IBDocument.InterfaceBuilderVersion">2549</string>
 		<string key="IBDocument.AppKitVersion">1138.47</string>
 		<string key="IBDocument.HIToolboxVersion">569.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			<string key="NS.object.0">1181</string>
+			<string key="NS.object.0">1498</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
-			<string>IBUIView</string>
+			<string>IBProxyObject</string>
+			<string>IBUIButton</string>
 			<string>IBUIImageView</string>
 			<string>IBUILabel</string>
-			<string>IBProxyObject</string>
-			<string>IBUITextField</string>
-			<string>IBUITableViewController</string>
 			<string>IBUITableView</string>
+			<string>IBUITableViewController</string>
 			<string>IBUITextView</string>
-			<string>IBUIButton</string>
+			<string>IBUIView</string>
 		</array>
 		<array key="IBDocument.PluginDependencies">
 			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -154,7 +153,6 @@
 										<string key="NSFrame">{{250, 0}, {70, 59}}</string>
 										<reference key="NSSuperview" ref="833509359"/>
 										<reference key="NSWindow"/>
-										<reference key="NSNextKeyView"/>
 										<string key="NSReuseIdentifierKey">_NS:9</string>
 										<bool key="IBUIOpaque">NO</bool>
 										<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
@@ -198,7 +196,7 @@
 										<string key="NSFrameSize">{250, 59}</string>
 										<reference key="NSSuperview" ref="833509359"/>
 										<reference key="NSWindow"/>
-										<reference key="NSNextKeyView" ref="87421816"/>
+										<reference key="NSNextKeyView" ref="607607719"/>
 										<string key="NSReuseIdentifierKey">_NS:9</string>
 										<bool key="IBUIUserInteractionEnabled">NO</bool>
 										<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -207,46 +205,9 @@
 											<string key="NSResourceName">chat_field.png</string>
 										</object>
 									</object>
-									<object class="IBUITextField" id="87421816">
-										<reference key="NSNextResponder" ref="833509359"/>
-										<int key="NSvFlags">-2147483390</int>
-										<string key="NSFrame">{{10, 10}, {230, 39}}</string>
-										<reference key="NSSuperview" ref="833509359"/>
-										<reference key="NSWindow"/>
-										<reference key="NSNextKeyView" ref="607607719"/>
-										<string key="NSReuseIdentifierKey">_NS:9</string>
-										<bool key="IBUIOpaque">NO</bool>
-										<bool key="IBUIClipsSubviews">YES</bool>
-										<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-										<int key="IBUIContentVerticalAlignment">0</int>
-										<string key="IBUIText"/>
-										<string key="IBUIPlaceholder">Type your message here</string>
-										<object class="NSColor" key="IBUITextColor">
-											<int key="NSColorSpace">3</int>
-											<bytes key="NSWhite">MAA</bytes>
-											<object class="NSColorSpace" key="NSCustomColorSpace" id="774336446">
-												<int key="NSID">2</int>
-											</object>
-										</object>
-										<float key="IBUIMinimumFontSize">17</float>
-										<object class="IBUITextInputTraits" key="IBUITextInputTraits">
-											<int key="IBUIAutocapitalizationType">2</int>
-											<int key="IBUIAutocorrectionType">2</int>
-											<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-										</object>
-										<object class="IBUIFontDescription" key="IBUIFontDescription" id="467582381">
-											<int key="type">1</int>
-											<double key="pointSize">18</double>
-										</object>
-										<object class="NSFont" key="IBUIFont" id="957794319">
-											<string key="NSName">Helvetica</string>
-											<double key="NSSize">18</double>
-											<int key="NSfFlags">16</int>
-										</object>
-									</object>
 									<object class="IBUITextView" id="607607719">
 										<reference key="NSNextResponder" ref="833509359"/>
-										<int key="NSvFlags">292</int>
+										<int key="NSvFlags">258</int>
 										<string key="NSFrame">{{10, 10}, {230, 39}}</string>
 										<reference key="NSSuperview" ref="833509359"/>
 										<reference key="NSWindow"/>
@@ -258,14 +219,22 @@
 											<string key="IBUIAccessibilityLabel"/>
 										</object>
 										<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-										<bool key="IBUIAlwaysBounceHorizontal">YES</bool>
-										<string key="IBUIText"/>
+										<bool key="IBUIAlwaysBounceVertical">YES</bool>
+										<bool key="IBUIShowsHorizontalScrollIndicator">NO</bool>
+										<string key="IBUIText">This is a message</string>
 										<object class="IBUITextInputTraits" key="IBUITextInputTraits">
 											<int key="IBUIAutocapitalizationType">2</int>
 											<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 										</object>
-										<reference key="IBUIFontDescription" ref="467582381"/>
-										<reference key="IBUIFont" ref="957794319"/>
+										<object class="IBUIFontDescription" key="IBUIFontDescription">
+											<int key="type">1</int>
+											<double key="pointSize">18</double>
+										</object>
+										<object class="NSFont" key="IBUIFont">
+											<string key="NSName">Helvetica</string>
+											<double key="NSSize">18</double>
+											<int key="NSfFlags">16</int>
+										</object>
 									</object>
 								</array>
 								<string key="NSFrame">{{0, 357}, {320, 59}}</string>
@@ -273,11 +242,7 @@
 								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="946416684"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
-								<object class="NSColor" key="IBUIBackgroundColor">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MQA</bytes>
-									<reference key="NSCustomColorSpace" ref="774336446"/>
-								</object>
+								<reference key="IBUIBackgroundColor" ref="460939904"/>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 							</object>
 						</array>
@@ -286,11 +251,7 @@
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="414508017"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<object class="NSColor" key="IBUIBackgroundColor">
-							<int key="NSColorSpace">3</int>
-							<bytes key="NSWhite">MQA</bytes>
-							<reference key="NSCustomColorSpace" ref="774336446"/>
-						</object>
+						<reference key="IBUIBackgroundColor" ref="460939904"/>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 					</object>
 					<object class="IBUIView" id="333187864">
@@ -378,11 +339,7 @@
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="393955689"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<object class="NSColor" key="IBUIBackgroundColor">
-							<int key="NSColorSpace">3</int>
-							<bytes key="NSWhite">MQA</bytes>
-							<reference key="NSCustomColorSpace" ref="774336446"/>
-						</object>
+						<reference key="IBUIBackgroundColor" ref="460939904"/>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 					</object>
 				</array>
@@ -661,7 +618,6 @@
 						<reference key="object" ref="833509359"/>
 						<array class="NSMutableArray" key="children">
 							<reference ref="946416684"/>
-							<reference ref="87421816"/>
 							<reference ref="487645621"/>
 							<reference ref="607607719"/>
 						</array>
@@ -686,12 +642,6 @@
 						<reference key="parent" ref="833509359"/>
 						<string key="objectName">messageField</string>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">19</int>
-						<reference key="object" ref="87421816"/>
-						<reference key="parent" ref="833509359"/>
-						<string key="objectName">messageFieldOld</string>
-					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -705,7 +655,6 @@
 				<string key="14.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="15.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="2" key="15.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
-				<string key="19.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="21.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="29.CustomClassName">ChatRoomTableViewController</string>
 				<string key="29.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -720,6 +669,7 @@
 				<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="8.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="9.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<real value="0.0" key="9.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
 				<real value="2" key="9.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
 			</dictionary>
 			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
@@ -856,6 +806,6 @@
 			<string key="chat_send_over.png">{140, 117}</string>
 			<string key="toolsbar_background.png">{5, 117}</string>
 		</dictionary>
-		<string key="IBCocoaTouchPluginVersion">1181</string>
+		<string key="IBCocoaTouchPluginVersion">1498</string>
 	</data>
 </archive>
diff --git a/Classes/FirstLoginViewController.m b/Classes/FirstLoginViewController.m
index 014cf0c35..e8d137a8b 100644
--- a/Classes/FirstLoginViewController.m
+++ b/Classes/FirstLoginViewController.m
@@ -180,7 +180,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 		linphone_core_clear_proxy_config([LinphoneManager getLc]);
 		LinphoneProxyConfig* proxyCfg = linphone_core_create_proxy_config([LinphoneManager getLc]);
 		/*default domain is supposed to be preset from linphonerc*/
-		NSString* identity = [NSString stringWithFormat:@"sip:%@@%@",usernameField.text,linphone_proxy_config_get_addr(proxyCfg)];
+		NSString* identity = [NSString stringWithFormat:@"sip:%@@%s",usernameField.text, linphone_proxy_config_get_addr(proxyCfg)];
 		linphone_proxy_config_set_identity(proxyCfg,[identity UTF8String]);
 		LinphoneAuthInfo* auth_info =linphone_auth_info_new([usernameField.text UTF8String]
 															,[usernameField.text UTF8String]
diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m
index c44183b4a..6cc0405f3 100644
--- a/Classes/LinphoneManager.m
+++ b/Classes/LinphoneManager.m
@@ -737,20 +737,21 @@ static LinphoneCoreVTable linphonec_vtable = {
 }
 
 - (void)waitForRegisterToArrive{
-	int i;
-	UIBackgroundTaskIdentifier bgid;
-	stopWaitingRegisters=FALSE;
-	[LinphoneLogger logc:LinphoneLoggerLog format:"Starting long running task for registering"];
-	bgid=[[UIApplication sharedApplication] beginBackgroundTaskWithExpirationHandler: ^{
-		[LinphoneManager instance]->stopWaitingRegisters=TRUE;
-		[LinphoneLogger logc:LinphoneLoggerLog format:"Expiration handler called"];
-	}];
-	for(i=0;i<100 && (!stopWaitingRegisters);i++){
-		linphone_core_iterate(theLinphoneCore);
-		usleep(20000);
-	}
-	[LinphoneLogger logc:LinphoneLoggerLog format:"Ending long running task for registering"];
-	[[UIApplication sharedApplication] endBackgroundTask:bgid];
+    if ([[UIDevice currentDevice] respondsToSelector:@selector(isMultitaskingSupported)]
+		&& [UIApplication sharedApplication].applicationState ==  UIApplicationStateBackground) {
+        stopWaitingRegisters = FALSE;
+        [LinphoneLogger logc:LinphoneLoggerLog format:"Starting long running task for registering"];
+        UIBackgroundTaskIdentifier bgid = [[UIApplication sharedApplication] beginBackgroundTaskWithExpirationHandler: ^{
+            [LinphoneManager instance]->stopWaitingRegisters=TRUE;
+            [LinphoneLogger logc:LinphoneLoggerLog format:"Expiration handler called"];
+        }];
+        for(int i=0;i<100 && (!stopWaitingRegisters);i++){
+            linphone_core_iterate(theLinphoneCore);
+            usleep(20000);
+        }
+        [LinphoneLogger logc:LinphoneLoggerLog format:"Ending long running task for registering"];
+        [[UIApplication sharedApplication] endBackgroundTask:bgid];
+    }
 }
 
 - (BOOL)enterBackgroundMode {
@@ -913,8 +914,8 @@ static LinphoneCoreVTable linphonec_vtable = {
         }
         linphone_address_destroy(linphoneAddress);
 	} else if (proxyCfg==nil){
-		UIAlertView* error = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Invalid sip address",nil)
-														message:NSLocalizedString(@"Either configure a SIP proxy server from settings prior to place a call or use a valid sip address (I.E sip:john@example.net)",nil) 
+		UIAlertView* error = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Invalid SIP address",nil)
+														message:NSLocalizedString(@"Either configure a SIP proxy server from settings prior to place a call or use a valid SIP address (I.E sip:john@example.net)",nil)
 													   delegate:nil 
 											  cancelButtonTitle:NSLocalizedString(@"Continue",nil) 
 											  otherButtonTitles:nil];
diff --git a/Classes/LinphoneUI/UIChatCell.m b/Classes/LinphoneUI/UIChatCell.m
index b6ad2bd80..dc6100161 100644
--- a/Classes/LinphoneUI/UIChatCell.m
+++ b/Classes/LinphoneUI/UIChatCell.m
@@ -77,13 +77,14 @@
         [LinphoneLogger logc:LinphoneLoggerWarning format:"Cannot update chat cell: null chat"];
         return;
     }
-    LinphoneAddress* linphoneAddress =linphone_core_interpret_url([LinphoneManager getLc],[[chat remoteContact] cStringUsingEncoding: NSUTF8StringEncoding]);
-	if (linphoneAddress==NULL)
-		return ;
-	char *tmp=linphone_address_as_string_uri_only(linphoneAddress);
-	NSString *normalizedSipAddress=[NSString stringWithUTF8String:tmp];
+    LinphoneAddress* linphoneAddress = linphone_core_interpret_url([LinphoneManager getLc], [[chat remoteContact] UTF8String]);
+	if (linphoneAddress == NULL)
+		return;
+	char *tmp = linphone_address_as_string_uri_only(linphoneAddress);
+	NSString *normalizedSipAddress = [NSString stringWithUTF8String:tmp];
 	ms_free(tmp);
-    ABRecordRef contact =[[[LinphoneManager instance] fastAddressBook] getContact:normalizedSipAddress];
+    
+    ABRecordRef contact = [[[LinphoneManager instance] fastAddressBook] getContact:normalizedSipAddress];
     if(contact != nil) {
         displayName = [FastAddressBook getContactDisplayName:contact];
         image = [FastAddressBook getContactImage:contact thumbnail:true];
@@ -91,7 +92,7 @@
     
     // Display name
     if(displayName == nil) {
-        displayName = [NSString stringWithCString:linphone_address_get_username(linphoneAddress) encoding:NSUTF8StringEncoding];
+        displayName = [NSString stringWithUTF8String:linphone_address_get_username(linphoneAddress)];
     }
     [addressLabel setText:displayName];
     
@@ -103,7 +104,8 @@
     
     // Message
     [chatContentLabel setText:[chat message]];
-	linphone_address_destroy(linphoneAddress);
+    
+    linphone_address_destroy(linphoneAddress);
 }
 
 - (void)layoutSubviews {
diff --git a/Classes/LinphoneUI/UIChatRoomCell.m b/Classes/LinphoneUI/UIChatRoomCell.m
index badd8088f..d432f37f8 100644
--- a/Classes/LinphoneUI/UIChatRoomCell.m
+++ b/Classes/LinphoneUI/UIChatRoomCell.m
@@ -38,7 +38,7 @@ static const CGFloat CELL_MIN_HEIGHT = 40.0f;
 static const CGFloat CELL_MIN_WIDTH = 150.0f;
 static const CGFloat CELL_MAX_WIDTH = 320.0f;
 static const CGFloat CELL_MESSAGE_X_MARGIN = 26.0f;
-static const CGFloat CELL_MESSAGE_Y_MARGIN = 33.0f;
+static const CGFloat CELL_MESSAGE_Y_MARGIN = 36.0f;
 static const CGFloat CELL_FONT_SIZE = 17.0f;
 static UIFont *CELL_FONT = nil;
 
diff --git a/Classes/LinphoneUI/UIChatRoomCell.xib b/Classes/LinphoneUI/UIChatRoomCell.xib
index e8127e89c..647825af5 100644
--- a/Classes/LinphoneUI/UIChatRoomCell.xib
+++ b/Classes/LinphoneUI/UIChatRoomCell.xib
@@ -3,19 +3,19 @@
 	<data>
 		<int key="IBDocument.SystemTarget">1296</int>
 		<string key="IBDocument.SystemVersion">11E53</string>
-		<string key="IBDocument.InterfaceBuilderVersion">2182</string>
+		<string key="IBDocument.InterfaceBuilderVersion">2549</string>
 		<string key="IBDocument.AppKitVersion">1138.47</string>
 		<string key="IBDocument.HIToolboxVersion">569.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			<string key="NS.object.0">1181</string>
+			<string key="NS.object.0">1498</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
+			<string>IBProxyObject</string>
 			<string>IBUIButton</string>
 			<string>IBUIImageView</string>
-			<string>IBUIView</string>
 			<string>IBUILabel</string>
-			<string>IBProxyObject</string>
+			<string>IBUIView</string>
 		</array>
 		<array key="IBDocument.PluginDependencies">
 			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -59,11 +59,15 @@
 							<object class="IBUILabel" id="281972462">
 								<reference key="NSNextResponder" ref="456806949"/>
 								<int key="NSvFlags">274</int>
-								<string key="NSFrameSize">{294, 107}</string>
+								<string key="NSFrameSize">{294, 104}</string>
 								<reference key="NSSuperview" ref="456806949"/>
 								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="859609488"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<object class="NSColor" key="IBUIBackgroundColor" id="765717609">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MCAwAA</bytes>
+								</object>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClipsSubviews">YES</bool>
 								<int key="IBUIContentMode">7</int>
@@ -77,7 +81,7 @@
 								<nil key="IBUIHighlightedColor"/>
 								<int key="IBUIBaselineAdjustment">0</int>
 								<float key="IBUIMinimumFontSize">10</float>
-								<int key="IBUINumberOfLines">100000</int>
+								<int key="IBUINumberOfLines">0</int>
 								<object class="IBUIFontDescription" key="IBUIFontDescription">
 									<int key="type">1</int>
 									<double key="pointSize">17</double>
@@ -89,60 +93,25 @@
 								</object>
 								<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
 							</object>
-							<object class="IBUIButton" id="859609488">
-								<reference key="NSNextResponder" ref="456806949"/>
-								<int key="NSvFlags">289</int>
-								<string key="NSFrame">{{250, 0}, {44, 44}}</string>
-								<reference key="NSSuperview" ref="456806949"/>
-								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView" ref="504194589"/>
-								<string key="NSReuseIdentifierKey">_NS:9</string>
-								<bool key="IBUIOpaque">NO</bool>
-								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<int key="IBUIContentHorizontalAlignment">0</int>
-								<int key="IBUIContentVerticalAlignment">0</int>
-								<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
-								<double key="IBUIImageEdgeInsets.top">2</double>
-								<double key="IBUIImageEdgeInsets.bottom">20</double>
-								<double key="IBUIImageEdgeInsets.left">20</double>
-								<double key="IBUIImageEdgeInsets.right">2</double>
-								<object class="NSColor" key="IBUINormalTitleShadowColor" id="479423909">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MC41AA</bytes>
-								</object>
-								<object class="NSCustomResource" key="IBUIHighlightedImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">list_delete_over.png</string>
-								</object>
-								<object class="NSCustomResource" key="IBUINormalImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">list_delete_default.png</string>
-								</object>
-								<object class="IBUIFontDescription" key="IBUIFontDescription">
-									<int key="type">2</int>
-									<double key="pointSize">15</double>
-								</object>
-								<object class="NSFont" key="IBUIFont">
-									<string key="NSName">Helvetica-Bold</string>
-									<double key="NSSize">15</double>
-									<int key="NSfFlags">16</int>
-								</object>
-							</object>
 							<object class="IBUILabel" id="504194589">
 								<reference key="NSNextResponder" ref="456806949"/>
 								<int key="NSvFlags">265</int>
-								<string key="NSFrame">{{14, 107}, {260, 7}}</string>
+								<string key="NSFrame">{{0, 104}, {280, 10}}</string>
 								<reference key="NSSuperview" ref="456806949"/>
 								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="197441422"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<reference key="IBUIBackgroundColor" ref="765717609"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClipsSubviews">YES</bool>
 								<int key="IBUIContentMode">7</int>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 								<string key="IBUIText">09/09/2009 at 09:09</string>
-								<reference key="IBUITextColor" ref="479423909"/>
+								<object class="NSColor" key="IBUITextColor" id="479423909">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MC41AA</bytes>
+								</object>
 								<nil key="IBUIHighlightedColor"/>
 								<int key="IBUIBaselineAdjustment">0</int>
 								<float key="IBUIMinimumFontSize">8</float>
@@ -173,16 +142,49 @@
 									<string key="NSResourceName">chat_message_not_delivered.png</string>
 								</object>
 							</object>
+							<object class="IBUIButton" id="859609488">
+								<reference key="NSNextResponder" ref="456806949"/>
+								<int key="NSvFlags">289</int>
+								<string key="NSFrame">{{250, 0}, {44, 44}}</string>
+								<reference key="NSSuperview" ref="456806949"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="504194589"/>
+								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<bool key="IBUIOpaque">NO</bool>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+								<int key="IBUIContentHorizontalAlignment">0</int>
+								<int key="IBUIContentVerticalAlignment">0</int>
+								<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
+								<double key="IBUIImageEdgeInsets.top">2</double>
+								<double key="IBUIImageEdgeInsets.bottom">20</double>
+								<double key="IBUIImageEdgeInsets.left">20</double>
+								<double key="IBUIImageEdgeInsets.right">2</double>
+								<reference key="IBUINormalTitleShadowColor" ref="479423909"/>
+								<object class="NSCustomResource" key="IBUIHighlightedImage">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">list_delete_over.png</string>
+								</object>
+								<object class="NSCustomResource" key="IBUINormalImage">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">list_delete_default.png</string>
+								</object>
+								<object class="IBUIFontDescription" key="IBUIFontDescription">
+									<int key="type">2</int>
+									<double key="pointSize">15</double>
+								</object>
+								<object class="NSFont" key="IBUIFont">
+									<string key="NSName">Helvetica-Bold</string>
+									<double key="NSSize">15</double>
+									<int key="NSfFlags">16</int>
+								</object>
+							</object>
 						</array>
 						<string key="NSFrame">{{13, 13}, {294, 114}}</string>
 						<reference key="NSSuperview" ref="579600281"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="281972462"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<object class="NSColor" key="IBUIBackgroundColor" id="765717609">
-							<int key="NSColorSpace">3</int>
-							<bytes key="NSWhite">MCAwAA</bytes>
-						</object>
+						<reference key="IBUIBackgroundColor" ref="765717609"/>
 						<bool key="IBUIClipsSubviews">YES</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 					</object>
@@ -356,8 +358,8 @@
 						<reference key="object" ref="456806949"/>
 						<array class="NSMutableArray" key="children">
 							<reference ref="281972462"/>
-							<reference ref="859609488"/>
 							<reference ref="504194589"/>
+							<reference ref="859609488"/>
 							<reference ref="197441422"/>
 						</array>
 						<reference key="parent" ref="579600281"/>
@@ -488,6 +490,6 @@
 			<string key="list_delete_default.png">{45, 45}</string>
 			<string key="list_delete_over.png">{45, 45}</string>
 		</dictionary>
-		<string key="IBCocoaTouchPluginVersion">1181</string>
+		<string key="IBCocoaTouchPluginVersion">1498</string>
 	</data>
 </archive>
diff --git a/Classes/LinphoneUI/UICompositeViewController.m b/Classes/LinphoneUI/UICompositeViewController.m
index 68e2037f0..ea0953c9a 100644
--- a/Classes/LinphoneUI/UICompositeViewController.m
+++ b/Classes/LinphoneUI/UICompositeViewController.m
@@ -425,11 +425,13 @@
             [contentView.layer removeAnimationForKey:@"transition"];
             [contentView.layer addAnimation:viewTransition forKey:@"transition"];
             if(oldViewDescription.stateBar != currentViewDescription.stateBar ||
+               oldViewDescription.stateBarEnabled != currentViewDescription.stateBarEnabled ||
                [stateBarView.layer animationForKey:@"transition"] != nil) {
                 [stateBarView.layer removeAnimationForKey:@"transition"];
                 [stateBarView.layer addAnimation:viewTransition forKey:@"transition"];
             }
             if(oldViewDescription.tabBar != currentViewDescription.tabBar ||
+               oldViewDescription.tabBarEnabled != currentViewDescription.tabBarEnabled ||
                [tabBarView.layer animationForKey:@"transition"] != nil) {
                 [tabBarView.layer removeAnimationForKey:@"transition"];
                 [tabBarView.layer addAnimation:viewTransition forKey:@"transition"];
diff --git a/Classes/LinphoneUI/UIMainBar.xib b/Classes/LinphoneUI/UIMainBar.xib
index d1f14bc5f..4276bf294 100644
--- a/Classes/LinphoneUI/UIMainBar.xib
+++ b/Classes/LinphoneUI/UIMainBar.xib
@@ -37,27 +37,11 @@
 				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">292</int>
 				<array class="NSMutableArray" key="NSSubviews">
-					<object class="IBUIView" id="760939856">
-						<reference key="NSNextResponder" ref="1018893129"/>
-						<int key="NSvFlags">290</int>
-						<string key="NSFrame">{{0, 77}, {320, 2000}}</string>
-						<reference key="NSSuperview" ref="1018893129"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="318948703"/>
-						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<object class="NSColor" key="IBUIBackgroundColor">
-							<int key="NSColorSpace">1</int>
-							<bytes key="NSRGB">MC4xNDkwMTk2MDc4IDAuMTY0NzA1ODgyNCAwLjE4MDM5MjE1NjkAA</bytes>
-						</object>
-						<int key="IBUITag">28</int>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-					</object>
 					<object class="IBUIView" id="83510153">
 						<reference key="NSNextResponder" ref="1018893129"/>
 						<int key="NSvFlags">-2147483356</int>
 						<string key="NSFrame">{{0, 11}, {320, 66}}</string>
 						<reference key="NSSuperview" ref="1018893129"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="698962606"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
@@ -71,12 +55,25 @@
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 					</object>
+					<object class="IBUIView" id="760939856">
+						<reference key="NSNextResponder" ref="1018893129"/>
+						<int key="NSvFlags">290</int>
+						<string key="NSFrame">{{0, 77}, {320, 2000}}</string>
+						<reference key="NSSuperview" ref="1018893129"/>
+						<reference key="NSNextKeyView" ref="318948703"/>
+						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<object class="NSColor" key="IBUIBackgroundColor">
+							<int key="NSColorSpace">1</int>
+							<bytes key="NSRGB">MC4xNDkwMTk2MDc4IDAuMTY0NzA1ODgyNCAwLjE4MDM5MjE1NjkAA</bytes>
+						</object>
+						<int key="IBUITag">28</int>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+					</object>
 					<object class="IBUIButton" id="318948703">
 						<reference key="NSNextResponder" ref="1018893129"/>
 						<int key="NSvFlags">292</int>
 						<string key="NSFrameSize">{64, 77}</string>
 						<reference key="NSSuperview" ref="1018893129"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="83510153"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -122,7 +119,6 @@
 								<int key="NSvFlags">274</int>
 								<string key="NSFrameSize">{21, 21}</string>
 								<reference key="NSSuperview" ref="698962606"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="364959328"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
@@ -137,7 +133,6 @@
 								<int key="NSvFlags">256</int>
 								<string key="NSFrame">{{2, 2}, {17, 17}}</string>
 								<reference key="NSSuperview" ref="698962606"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="617445003"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -167,7 +162,6 @@
 						</array>
 						<string key="NSFrame">{{38, 1}, {21, 21}}</string>
 						<reference key="NSSuperview" ref="1018893129"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="307047814"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor" id="41402419">
@@ -183,7 +177,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{64, 0}, {64, 77}}</string>
 						<reference key="NSSuperview" ref="1018893129"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="562688945"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -215,7 +208,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{192, 0}, {64, 77}}</string>
 						<reference key="NSSuperview" ref="1018893129"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="55915342"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -247,7 +239,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{128, 0}, {64, 77}}</string>
 						<reference key="NSSuperview" ref="1018893129"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="60891552"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -279,7 +270,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{256, 0}, {64, 77}}</string>
 						<reference key="NSSuperview" ref="1018893129"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="154031566"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -315,7 +305,6 @@
 								<int key="NSvFlags">274</int>
 								<string key="NSFrameSize">{21, 21}</string>
 								<reference key="NSSuperview" ref="154031566"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="540244639"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
@@ -327,8 +316,6 @@
 								<int key="NSvFlags">256</int>
 								<string key="NSFrame">{{2, 2}, {17, 17}}</string>
 								<reference key="NSSuperview" ref="154031566"/>
-								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClipsSubviews">YES</bool>
@@ -347,7 +334,6 @@
 						</array>
 						<string key="NSFrame">{{261, 1}, {21, 21}}</string>
 						<reference key="NSSuperview" ref="1018893129"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="651674302"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="41402419"/>
@@ -358,7 +344,6 @@
 				</array>
 				<string key="NSFrameSize">{320, 77}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="760939856"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<object class="NSColor" key="IBUIBackgroundColor">
@@ -532,10 +517,10 @@
 							<reference ref="617445003"/>
 							<reference ref="318948703"/>
 							<reference ref="55915342"/>
-							<reference ref="83510153"/>
 							<reference ref="562688945"/>
 							<reference ref="698962606"/>
 							<reference ref="154031566"/>
+							<reference ref="83510153"/>
 							<reference ref="760939856"/>
 						</array>
 						<reference key="parent" ref="0"/>
@@ -661,118 +646,7 @@
 			<nil key="sourceID"/>
 			<int key="maxID">45</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">TPMultiLayoutViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="landscapeView">UIView</string>
-						<string key="portraitView">UIView</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="landscapeView">
-							<string key="name">landscapeView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="portraitView">
-							<string key="name">portraitView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/TPMultiLayoutViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UIMainBar</string>
-					<string key="superclassName">TPMultiLayoutViewController</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="onChatClick:">id</string>
-						<string key="onContactsClick:">id</string>
-						<string key="onDialerClick:">id</string>
-						<string key="onHistoryClick:">id</string>
-						<string key="onSettingsClick:">id</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="onChatClick:">
-							<string key="name">onChatClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onContactsClick:">
-							<string key="name">onContactsClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onDialerClick:">
-							<string key="name">onDialerClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onHistoryClick:">
-							<string key="name">onHistoryClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onSettingsClick:">
-							<string key="name">onSettingsClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="chatButton">UIButton</string>
-						<string key="chatNotificationLabel">UILabel</string>
-						<string key="chatNotificationView">UIView</string>
-						<string key="contactsButton">UIButton</string>
-						<string key="dialerButton">UIButton</string>
-						<string key="historyButton">UIButton</string>
-						<string key="historyNotificationLabel">UILabel</string>
-						<string key="historyNotificationView">UIView</string>
-						<string key="settingsButton">UIButton</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="chatButton">
-							<string key="name">chatButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="chatNotificationLabel">
-							<string key="name">chatNotificationLabel</string>
-							<string key="candidateClassName">UILabel</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="chatNotificationView">
-							<string key="name">chatNotificationView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="contactsButton">
-							<string key="name">contactsButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="dialerButton">
-							<string key="name">dialerButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="historyButton">
-							<string key="name">historyButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="historyNotificationLabel">
-							<string key="name">historyNotificationLabel</string>
-							<string key="candidateClassName">UILabel</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="historyNotificationView">
-							<string key="name">historyNotificationView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="settingsButton">
-							<string key="name">settingsButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIMainBar.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
diff --git a/Classes/LinphoneUI/UIMainBar~ipad.xib b/Classes/LinphoneUI/UIMainBar~ipad.xib
index 559a0e4b0..dd2648b97 100644
--- a/Classes/LinphoneUI/UIMainBar~ipad.xib
+++ b/Classes/LinphoneUI/UIMainBar~ipad.xib
@@ -37,27 +37,11 @@
 				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">292</int>
 				<array class="NSMutableArray" key="NSSubviews">
-					<object class="IBUIView" id="103487099">
-						<reference key="NSNextResponder" ref="215340891"/>
-						<int key="NSvFlags">290</int>
-						<string key="NSFrame">{{0, 77}, {768, 2000}}</string>
-						<reference key="NSSuperview" ref="215340891"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="877138605"/>
-						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<object class="NSColor" key="IBUIBackgroundColor">
-							<int key="NSColorSpace">1</int>
-							<bytes key="NSRGB">MC4xNDkwMTk2MDc4IDAuMTY0NzA1ODgyNCAwLjE4MDM5MjE1NjkAA</bytes>
-						</object>
-						<int key="IBUITag">28</int>
-						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
-					</object>
 					<object class="IBUIView" id="783828575">
 						<reference key="NSNextResponder" ref="215340891"/>
 						<int key="NSvFlags">-2147483356</int>
 						<string key="NSFrame">{{0, 11}, {768, 66}}</string>
 						<reference key="NSSuperview" ref="215340891"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="16083720"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
@@ -71,12 +55,25 @@
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
 						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
 					</object>
+					<object class="IBUIView" id="103487099">
+						<reference key="NSNextResponder" ref="215340891"/>
+						<int key="NSvFlags">290</int>
+						<string key="NSFrame">{{0, 77}, {768, 2000}}</string>
+						<reference key="NSSuperview" ref="215340891"/>
+						<reference key="NSNextKeyView" ref="877138605"/>
+						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<object class="NSColor" key="IBUIBackgroundColor">
+							<int key="NSColorSpace">1</int>
+							<bytes key="NSRGB">MC4xNDkwMTk2MDc4IDAuMTY0NzA1ODgyNCAwLjE4MDM5MjE1NjkAA</bytes>
+						</object>
+						<int key="IBUITag">28</int>
+						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
+					</object>
 					<object class="IBUIButton" id="172706520">
 						<reference key="NSNextResponder" ref="215340891"/>
 						<int key="NSvFlags">292</int>
 						<string key="NSFrameSize">{175, 77}</string>
 						<reference key="NSSuperview" ref="215340891"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="783828575"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -123,7 +120,6 @@
 								<int key="NSvFlags">274</int>
 								<string key="NSFrameSize">{21, 21}</string>
 								<reference key="NSSuperview" ref="16083720"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="690072035"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
@@ -138,7 +134,6 @@
 								<int key="NSvFlags">256</int>
 								<string key="NSFrame">{{2, 2}, {17, 17}}</string>
 								<reference key="NSSuperview" ref="16083720"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1012118169"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -168,7 +163,6 @@
 						</array>
 						<string key="NSFrame">{{140, 1}, {21, 21}}</string>
 						<reference key="NSSuperview" ref="215340891"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="459410862"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor" id="339339950">
@@ -185,7 +179,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{175, 0}, {175, 77}}</string>
 						<reference key="NSSuperview" ref="215340891"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="103487099"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -218,7 +211,6 @@
 						<int key="NSvFlags">288</int>
 						<string key="NSFrame">{{350, -1}, {68, 80}}</string>
 						<reference key="NSSuperview" ref="215340891"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="582329659"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -251,7 +243,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{418, 0}, {175, 77}}</string>
 						<reference key="NSSuperview" ref="215340891"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="66637371"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -284,7 +275,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{593, 0}, {175, 77}}</string>
 						<reference key="NSSuperview" ref="215340891"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="686020189"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -321,7 +311,6 @@
 								<int key="NSvFlags">274</int>
 								<string key="NSFrameSize">{21, 21}</string>
 								<reference key="NSSuperview" ref="686020189"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="541323646"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
@@ -333,8 +322,6 @@
 								<int key="NSvFlags">256</int>
 								<string key="NSFrame">{{2, 2}, {17, 17}}</string>
 								<reference key="NSSuperview" ref="686020189"/>
-								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClipsSubviews">YES</bool>
@@ -353,7 +340,6 @@
 						</array>
 						<string key="NSFrame">{{605, 1}, {21, 21}}</string>
 						<reference key="NSSuperview" ref="215340891"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="765093070"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="339339950"/>
@@ -365,7 +351,6 @@
 				</array>
 				<string key="NSFrameSize">{768, 77}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="172706520"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<object class="NSColor" key="IBUIBackgroundColor">
@@ -379,27 +364,11 @@
 				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">292</int>
 				<array class="NSMutableArray" key="NSSubviews">
-					<object class="IBUIView" id="849328902">
-						<reference key="NSNextResponder" ref="774649127"/>
-						<int key="NSvFlags">290</int>
-						<string key="NSFrame">{{0, 86}, {1024, 2000}}</string>
-						<reference key="NSSuperview" ref="774649127"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="174827909"/>
-						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<object class="NSColor" key="IBUIBackgroundColor">
-							<int key="NSColorSpace">1</int>
-							<bytes key="NSRGB">MC4xNDkwMTk2MDc4IDAuMTY0NzA1ODgyNCAwLjE4MDM5MjE1NjkAA</bytes>
-						</object>
-						<int key="IBUITag">28</int>
-						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
-					</object>
 					<object class="IBUIView" id="91594118">
 						<reference key="NSNextResponder" ref="774649127"/>
 						<int key="NSvFlags">-2147483356</int>
 						<string key="NSFrame">{{0, 19}, {1024, 67}}</string>
 						<reference key="NSSuperview" ref="774649127"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="948217795"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
@@ -413,12 +382,25 @@
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
 						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
 					</object>
+					<object class="IBUIView" id="849328902">
+						<reference key="NSNextResponder" ref="774649127"/>
+						<int key="NSvFlags">290</int>
+						<string key="NSFrame">{{0, 86}, {1024, 2000}}</string>
+						<reference key="NSSuperview" ref="774649127"/>
+						<reference key="NSNextKeyView" ref="174827909"/>
+						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<object class="NSColor" key="IBUIBackgroundColor">
+							<int key="NSColorSpace">1</int>
+							<bytes key="NSRGB">MC4xNDkwMTk2MDc4IDAuMTY0NzA1ODgyNCAwLjE4MDM5MjE1NjkAA</bytes>
+						</object>
+						<int key="IBUITag">28</int>
+						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
+					</object>
 					<object class="IBUIButton" id="938095300">
 						<reference key="NSNextResponder" ref="774649127"/>
 						<int key="NSvFlags">292</int>
 						<string key="NSFrameSize">{240, 86}</string>
 						<reference key="NSSuperview" ref="774649127"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="91594118"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -455,7 +437,6 @@
 								<int key="NSvFlags">274</int>
 								<string key="NSFrameSize">{21, 21}</string>
 								<reference key="NSSuperview" ref="948217795"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="281444351"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
@@ -467,7 +448,6 @@
 								<int key="NSvFlags">256</int>
 								<string key="NSFrame">{{2, 2}, {17, 17}}</string>
 								<reference key="NSSuperview" ref="948217795"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="872188125"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -487,7 +467,6 @@
 						</array>
 						<string key="NSFrame">{{208, 1}, {21, 21}}</string>
 						<reference key="NSSuperview" ref="774649127"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="70667666"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="339339950"/>
@@ -501,7 +480,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{240, 0}, {240, 86}}</string>
 						<reference key="NSSuperview" ref="774649127"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="849328902"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -534,7 +512,6 @@
 						<int key="NSvFlags">288</int>
 						<string key="NSFrame">{{480, 8}, {68, 80}}</string>
 						<reference key="NSSuperview" ref="774649127"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="13787191"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -558,7 +535,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{544, 0}, {240, 86}}</string>
 						<reference key="NSSuperview" ref="774649127"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="730250721"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -591,7 +567,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{784, 0}, {240, 86}}</string>
 						<reference key="NSSuperview" ref="774649127"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="129284976"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
@@ -628,7 +603,6 @@
 								<int key="NSvFlags">274</int>
 								<string key="NSFrameSize">{21, 21}</string>
 								<reference key="NSSuperview" ref="129284976"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="183279807"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
@@ -640,8 +614,6 @@
 								<int key="NSvFlags">256</int>
 								<string key="NSFrame">{{2, 2}, {17, 17}}</string>
 								<reference key="NSSuperview" ref="129284976"/>
-								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClipsSubviews">YES</bool>
@@ -660,7 +632,6 @@
 						</array>
 						<string key="NSFrame">{{792, 1}, {21, 21}}</string>
 						<reference key="NSSuperview" ref="774649127"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="669403928"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="339339950"/>
@@ -672,7 +643,6 @@
 				</array>
 				<string key="NSFrameSize">{1024, 86}</string>
 				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="938095300"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<object class="NSColor" key="IBUIBackgroundColor">
@@ -852,12 +822,12 @@
 						<array class="NSMutableArray" key="children">
 							<reference ref="16083720"/>
 							<reference ref="877138605"/>
-							<reference ref="783828575"/>
 							<reference ref="66637371"/>
 							<reference ref="172706520"/>
 							<reference ref="1012118169"/>
 							<reference ref="582329659"/>
 							<reference ref="686020189"/>
+							<reference ref="783828575"/>
 							<reference ref="103487099"/>
 						</array>
 						<reference key="parent" ref="0"/>
@@ -950,12 +920,12 @@
 						<array class="NSMutableArray" key="children">
 							<reference ref="872188125"/>
 							<reference ref="938095300"/>
-							<reference ref="91594118"/>
 							<reference ref="174827909"/>
 							<reference ref="730250721"/>
 							<reference ref="13787191"/>
 							<reference ref="129284976"/>
 							<reference ref="948217795"/>
+							<reference ref="91594118"/>
 							<reference ref="849328902"/>
 						</array>
 						<reference key="parent" ref="0"/>
@@ -1108,118 +1078,7 @@
 			<nil key="sourceID"/>
 			<int key="maxID">62</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">TPMultiLayoutViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="landscapeView">UIView</string>
-						<string key="portraitView">UIView</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="landscapeView">
-							<string key="name">landscapeView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="portraitView">
-							<string key="name">portraitView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/TPMultiLayoutViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UIMainBar</string>
-					<string key="superclassName">TPMultiLayoutViewController</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="onChatClick:">id</string>
-						<string key="onContactsClick:">id</string>
-						<string key="onDialerClick:">id</string>
-						<string key="onHistoryClick:">id</string>
-						<string key="onSettingsClick:">id</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="onChatClick:">
-							<string key="name">onChatClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onContactsClick:">
-							<string key="name">onContactsClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onDialerClick:">
-							<string key="name">onDialerClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onHistoryClick:">
-							<string key="name">onHistoryClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="onSettingsClick:">
-							<string key="name">onSettingsClick:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="chatButton">UIButton</string>
-						<string key="chatNotificationLabel">UILabel</string>
-						<string key="chatNotificationView">UIView</string>
-						<string key="contactsButton">UIButton</string>
-						<string key="dialerButton">UIButton</string>
-						<string key="historyButton">UIButton</string>
-						<string key="historyNotificationLabel">UILabel</string>
-						<string key="historyNotificationView">UIView</string>
-						<string key="settingsButton">UIButton</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="chatButton">
-							<string key="name">chatButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="chatNotificationLabel">
-							<string key="name">chatNotificationLabel</string>
-							<string key="candidateClassName">UILabel</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="chatNotificationView">
-							<string key="name">chatNotificationView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="contactsButton">
-							<string key="name">contactsButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="dialerButton">
-							<string key="name">dialerButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="historyButton">
-							<string key="name">historyButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="historyNotificationLabel">
-							<string key="name">historyNotificationLabel</string>
-							<string key="candidateClassName">UILabel</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="historyNotificationView">
-							<string key="name">historyNotificationView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="settingsButton">
-							<string key="name">settingsButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIMainBar.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBIPadFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj
index 6a3eca7ba..c9f2309a0 100755
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@@ -2662,12 +2662,6 @@
 		29B97317FDCFA39411CA2CEA /* Resources */ = {
 			isa = PBXGroup;
 			children = (
-				57F005C615EE2D9200914747 /* linphonerc-factory */,
-				57F005C715EE2D9200914747 /* linphonerc-factory~ipad */,
-				57F005C315EE2CCF00914747 /* linphonerc */,
-				2234C8ED15EE744200E18E83 /* chat_message_inprogress.png */,
-				2234C8E715EE2F7F00E18E83 /* chat_message_delivered.png */,
-				2234C8E815EE2F7F00E18E83 /* chat_message_not_delivered.png */,
 				D3F83F741582253100336684 /* accept_default.png */,
 				D3F83F751582253100336684 /* accept_over.png */,
 				D3D6A39B159B0EEF005F692C /* add_call_default.png */,
@@ -2748,6 +2742,9 @@
 				D3A74F5A15C6AA0B001500B9 /* chat_field.9.png */,
 				D3A74F5D15C6ADA9001500B9 /* chat_field.9@2x.png */,
 				D3B9A3DA15A58C440096EA4E /* chat_field.png */,
+				2234C8E715EE2F7F00E18E83 /* chat_message_delivered.png */,
+				2234C8ED15EE744200E18E83 /* chat_message_inprogress.png */,
+				2234C8E815EE2F7F00E18E83 /* chat_message_not_delivered.png */,
 				D3B9A3DB15A58C440096EA4E /* chat_ok_default.png */,
 				D3B9A3DC15A58C440096EA4E /* chat_ok_over.png */,
 				D38327FF158100E400FA0D23 /* chat_over.png */,
@@ -2864,6 +2861,9 @@
 				D33CF34815D3A03400CD4B85 /* linphone_icon_57@2x.png */,
 				34A6ECEA14CF13CB00460C04 /* linphone_icon_72.png */,
 				D33CF34915D3A03400CD4B85 /* linphone_icon_72@2x.png */,
+				57F005C315EE2CCF00914747 /* linphonerc */,
+				57F005C615EE2D9200914747 /* linphonerc-factory */,
+				57F005C715EE2D9200914747 /* linphonerc-factory~ipad */,
 				D321FF9815E628CB0098B5F4 /* linphonerc~ipad */,
 				D3EA5416159858A80037DC6B /* list_delete_default.png */,
 				D3EA5417159858A80037DC6B /* list_delete_over.png */,