diff --git a/Classes/ChatConversationInfoView.xib b/Classes/ChatConversationInfoView.xib
index f29006775..2e2eef960 100644
--- a/Classes/ChatConversationInfoView.xib
+++ b/Classes/ChatConversationInfoView.xib
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_0" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -23,29 +23,29 @@
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="BKk-x7-cO3" userLabel="iphone6MetricsView">
-            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+            <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <subviews>
                 <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="zgv-a8-72k">
-                    <rect key="frame" x="0.0" y="42" width="375" height="559"/>
+                    <rect key="frame" x="0.0" y="42" width="320" height="460"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                     <subviews>
                         <tableView clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" alwaysBounceVertical="YES" style="plain" separatorStyle="default" allowsSelectionDuringEditing="YES" allowsMultipleSelectionDuringEditing="YES" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="pMq-Gv-0uu">
-                            <rect key="frame" x="0.0" y="148" width="375" height="315"/>
+                            <rect key="frame" x="0.0" y="148" width="320" height="239"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES" flexibleMaxY="YES"/>
                             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <color key="separatorColor" red="0.67030966280000004" green="0.71867996450000005" blue="0.75078284740000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         </tableView>
                         <view contentMode="scaleToFill" fixedFrame="YES" insetsLayoutMarginsFromSafeArea="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Meo-HD-uD0" userLabel="topBar">
-                            <rect key="frame" x="0.0" y="0.0" width="375" height="66"/>
+                            <rect key="frame" x="0.0" y="0.0" width="320" height="66"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                             <subviews>
                                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="color_F.png" translatesAutoresizingMaskIntoConstraints="NO" id="Sna-Ku-1Aq" userLabel="backgroundColor">
-                                    <rect key="frame" x="0.0" y="0.0" width="375" height="66"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="320" height="66"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES"/>
                                 </imageView>
                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" tag="5" contentMode="left" fixedFrame="YES" text="Info" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="tJn-Nv-Duq" userLabel="addressLabel">
-                                    <rect key="frame" x="112" y="0.0" width="150" height="66"/>
+                                    <rect key="frame" x="96" y="0.0" width="128" height="66"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES"/>
                                     <accessibility key="accessibilityConfiguration" label="Contact name">
                                         <accessibilityTraits key="traits" none="YES"/>
@@ -55,7 +55,7 @@
                                     <nil key="highlightedColor"/>
                                 </label>
                                 <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="HVD-Ql-SJG" userLabel="backButton" customClass="UIIconButton">
-                                    <rect key="frame" x="0.0" y="0.0" width="75" height="66"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="64" height="66"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES"/>
                                     <accessibility key="accessibilityConfiguration" label="Back"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -70,7 +70,7 @@
                                     </connections>
                                 </button>
                                 <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0v1-qv-lPd" userLabel="nextButton" customClass="UIIconButton">
-                                    <rect key="frame" x="300" y="0.0" width="75" height="66"/>
+                                    <rect key="frame" x="256" y="0.0" width="64" height="66"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES"/>
                                     <accessibility key="accessibilityConfiguration" label="Back"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -96,15 +96,15 @@
                             <textInputTraits key="textInputTraits" autocorrectionType="no" returnKeyType="next" enablesReturnKeyAutomatically="YES"/>
                         </textField>
                         <view contentMode="scaleToFill" fixedFrame="YES" insetsLayoutMarginsFromSafeArea="NO" translatesAutoresizingMaskIntoConstraints="NO" id="n8e-tx-jlu" userLabel="particpantsBar">
-                            <rect key="frame" x="0.0" y="112" width="375" height="28"/>
+                            <rect key="frame" x="0.0" y="112" width="320" height="28"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                             <subviews>
                                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="color_G.png" translatesAutoresizingMaskIntoConstraints="NO" id="t4R-zd-mU3" userLabel="backgroundColor">
-                                    <rect key="frame" x="0.0" y="0.0" width="375" height="28"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="320" height="28"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES"/>
                                 </imageView>
                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" tag="5" contentMode="left" fixedFrame="YES" text="Participants" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="vof-h9-AN3" userLabel="participantsLabel">
-                                    <rect key="frame" x="0.0" y="0.0" width="375" height="28"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="320" height="28"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES"/>
                                     <accessibility key="accessibilityConfiguration" label="Contact name">
                                         <accessibilityTraits key="traits" none="YES"/>
@@ -114,7 +114,7 @@
                                     <nil key="highlightedColor"/>
                                 </label>
                                 <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="XSI-9T-NtW" userLabel="addButton" customClass="UIIconButton">
-                                    <rect key="frame" x="346" y="4" width="21" height="21"/>
+                                    <rect key="frame" x="295" y="4" width="18" height="21"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES"/>
                                     <accessibility key="accessibilityConfiguration" label="Back"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -149,11 +149,11 @@
                             </connections>
                         </button>
                         <view hidden="YES" tag="8" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="nt8-fb-6Re" userLabel="waitView">
-                            <rect key="frame" x="0.0" y="0.0" width="375" height="559"/>
+                            <rect key="frame" x="0.0" y="0.0" width="320" height="460"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <activityIndicatorView opaque="NO" tag="9" contentMode="scaleToFill" fixedFrame="YES" animating="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="SNK-Vt-iQa" userLabel="activityIndicatorView">
-                                    <rect key="frame" x="179" y="267" width="20" height="20"/>
+                                    <rect key="frame" x="151" y="218" width="20" height="20"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                 </activityIndicatorView>
                             </subviews>
diff --git a/Classes/ChatConversationView.m b/Classes/ChatConversationView.m
index c853b634e..730554a7c 100644
--- a/Classes/ChatConversationView.m
+++ b/Classes/ChatConversationView.m
@@ -108,44 +108,6 @@ static UICompositeViewDescription *compositeDescription = nil;
 										   selector:@selector(callUpdateEvent:)
 											   name:kLinphoneCallUpdate
 											 object:nil];
-
-	LinphoneChatRoomCbs *cbs = linphone_chat_room_get_callbacks(_chatRoom);
-	linphone_chat_room_cbs_set_state_changed(cbs, on_chat_room_state_changed);
-	linphone_chat_room_cbs_set_subject_changed(cbs, on_chat_room_subject_changed);
-	linphone_chat_room_cbs_set_participant_added(cbs, on_chat_room_participant_added);
-	linphone_chat_room_cbs_set_participant_removed(cbs, on_chat_room_participant_removed);
-	linphone_chat_room_cbs_set_participant_admin_status_changed(cbs, on_chat_room_participant_admin_status_changed);
-	linphone_chat_room_cbs_set_chat_message_received(cbs, on_chat_room_chat_message_received);
-	linphone_chat_room_cbs_set_chat_message_sent(cbs, on_chat_room_chat_message_sent);
-	linphone_chat_room_cbs_set_is_composing_received(cbs, on_chat_room_is_composing_received);
-	linphone_chat_room_cbs_set_user_data(cbs, (__bridge void*)self);
-
-	[self updateSuperposedButtons];
-	
-	if (_tableController.isEditing)
-		[_tableController setEditing:NO];
-
-	[[_tableController tableView] reloadData];
-
-	BOOL fileSharingEnabled = linphone_core_get_file_transfer_server(LC) != NULL;
-	[_pictureButton setEnabled:fileSharingEnabled];
-
-	[self callUpdateEvent:nil];
-	PhoneMainView.instance.currentRoom = _chatRoom;
-	LinphoneChatRoomCapabilitiesMask capabilities = linphone_chat_room_get_capabilities(_chatRoom);
-	if (capabilities & LinphoneChatRoomCapabilitiesOneToOne) {
-		bctbx_list_t *participants = linphone_chat_room_get_participants(_chatRoom);
-		LinphoneParticipant *firstParticipant = participants ? (LinphoneParticipant *)participants->data : NULL;
-		const LinphoneAddress *addr = firstParticipant ? linphone_participant_get_address(firstParticipant) : linphone_chat_room_get_peer_address(_chatRoom);
-		[ContactDisplay setDisplayNameLabel:_addressLabel forAddress:addr];
-	} else
-		_addressLabel.text = [NSString stringWithUTF8String:linphone_chat_room_get_subject(_chatRoom)];
-
-	[self updateParticipantLabel];
-
-	_messageField.editable = !linphone_chat_room_has_been_left(_chatRoom);
-	_pictureButton.enabled = !linphone_chat_room_has_been_left(_chatRoom);
-	_messageView.userInteractionEnabled = !linphone_chat_room_has_been_left(_chatRoom);
 }
 
 - (void)viewWillDisappear:(BOOL)animated {
@@ -187,8 +149,44 @@ static UICompositeViewDescription *compositeDescription = nil;
 #pragma mark -
 
 - (void)setChatRoom:(LinphoneChatRoom *)chatRoom {
-
 	_chatRoom = chatRoom;
+	LinphoneChatRoomCbs *cbs = linphone_chat_room_get_callbacks(_chatRoom);
+	linphone_chat_room_cbs_set_state_changed(cbs, on_chat_room_state_changed);
+	linphone_chat_room_cbs_set_subject_changed(cbs, on_chat_room_subject_changed);
+	linphone_chat_room_cbs_set_participant_added(cbs, on_chat_room_participant_added);
+	linphone_chat_room_cbs_set_participant_removed(cbs, on_chat_room_participant_removed);
+	linphone_chat_room_cbs_set_participant_admin_status_changed(cbs, on_chat_room_participant_admin_status_changed);
+	linphone_chat_room_cbs_set_chat_message_received(cbs, on_chat_room_chat_message_received);
+	linphone_chat_room_cbs_set_chat_message_sent(cbs, on_chat_room_chat_message_sent);
+	linphone_chat_room_cbs_set_is_composing_received(cbs, on_chat_room_is_composing_received);
+	linphone_chat_room_cbs_set_user_data(cbs, (__bridge void*)self);
+
+	[self updateSuperposedButtons];
+
+	if (_tableController.isEditing)
+		[_tableController setEditing:NO];
+
+	[[_tableController tableView] reloadData];
+
+	BOOL fileSharingEnabled = linphone_core_get_file_transfer_server(LC) != NULL;
+	[_pictureButton setEnabled:fileSharingEnabled];
+
+	[self callUpdateEvent:nil];
+	PhoneMainView.instance.currentRoom = _chatRoom;
+	LinphoneChatRoomCapabilitiesMask capabilities = linphone_chat_room_get_capabilities(_chatRoom);
+	if (capabilities & LinphoneChatRoomCapabilitiesOneToOne) {
+		bctbx_list_t *participants = linphone_chat_room_get_participants(_chatRoom);
+		LinphoneParticipant *firstParticipant = participants ? (LinphoneParticipant *)participants->data : NULL;
+		const LinphoneAddress *addr = firstParticipant ? linphone_participant_get_address(firstParticipant) : linphone_chat_room_get_peer_address(_chatRoom);
+		[ContactDisplay setDisplayNameLabel:_addressLabel forAddress:addr];
+	} else
+		_addressLabel.text = [NSString stringWithUTF8String:linphone_chat_room_get_subject(_chatRoom)];
+
+	[self updateParticipantLabel];
+
+	_messageField.editable = !linphone_chat_room_has_been_left(_chatRoom);
+	_pictureButton.enabled = !linphone_chat_room_has_been_left(_chatRoom);
+	_messageView.userInteractionEnabled = !linphone_chat_room_has_been_left(_chatRoom);
 	[_messageField setText:@""];
 	[_tableController setChatRoom:_chatRoom];
 
@@ -223,10 +221,8 @@ static UICompositeViewDescription *compositeDescription = nil;
 - (void)markAsRead {
 	linphone_chat_room_mark_as_read(_chatRoom);
 	if (IPAD) {
-		if (IPAD) {
-			ChatsListView *listView = VIEW(ChatsListView);
-			[listView.tableController markCellAsRead:_chatRoom];
-		}
+		ChatsListView *listView = VIEW(ChatsListView);
+		[listView.tableController markCellAsRead:_chatRoom];
 	}
 }
 
diff --git a/Classes/ContactDetailsView.m b/Classes/ContactDetailsView.m
index fc2eb6735..4524dcc5f 100644
--- a/Classes/ContactDetailsView.m
+++ b/Classes/ContactDetailsView.m
@@ -50,7 +50,6 @@
 #pragma mark -
 
 - (void)onAddressBookUpdate:(NSNotification *)k {
-
   if (!inhibUpdate && ![_tableController isEditing] &&
       (PhoneMainView.instance.currentView == self.compositeViewDescription) &&
       (_nameLabel.text == PhoneMainView.instance.currentName)) {
diff --git a/Classes/PhoneMainView.m b/Classes/PhoneMainView.m
index 58ffc2ef5..4a5ed6f84 100644
--- a/Classes/PhoneMainView.m
+++ b/Classes/PhoneMainView.m
@@ -898,10 +898,20 @@ static RootViewManager *rootViewManagerInstance = nil;
 void main_view_chat_room_state_changed(LinphoneChatRoom *cr, LinphoneChatRoomState newState) {
 	PhoneMainView *view = PhoneMainView.instance;
 	switch (newState) {
-		case LinphoneChatRoomStateCreated:
+		case LinphoneChatRoomStateCreated: {
 			LOGI(@"Chat room [%p] created on server.", cr);
 			[view goToChatRoom:cr];
+			if (!IPAD)
+				break;
+
+			if (PhoneMainView.instance.currentView != ChatsListView.compositeViewDescription && PhoneMainView.instance.currentView != ChatConversationView.compositeViewDescription)
+				break;
+
+			ChatsListView *mainView = VIEW(ChatsListView);
+			[mainView.tableController loadData];
+			[mainView.tableController selectFirstRow];
 			break;
+		}
 		case LinphoneChatRoomStateCreationFailed:
 			view.waitView.hidden = YES;
 			[ChatConversationInfoView displayCreationError];