diff --git a/Classes/Base.lproj/CallView.xib b/Classes/Base.lproj/CallView.xib
index ad663885f..48a7d6ed2 100644
--- a/Classes/Base.lproj/CallView.xib
+++ b/Classes/Base.lproj/CallView.xib
@@ -635,7 +635,7 @@
                                             </connections>
                                         </button>
                                         <view hidden="YES" autoresizesSubviews="NO" userInteractionEnabled="NO" tag="70" contentMode="scaleToFill" id="d9Y-2a-CDI" userLabel="chatNotificationView" customClass="UIBouncingView">
-                                            <rect key="frame" x="337" y="8" width="22" height="22"/>
+                                            <rect key="frame" x="331" y="1" width="22" height="22"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/>
                                             <subviews>
                                                 <imageView userInteractionEnabled="NO" tag="71" contentMode="scaleAspectFit" image="history_chat_indicator.png" id="nPO-PM-4zJ" userLabel="chatNotificationImage">
@@ -1231,7 +1231,7 @@
                                             </connections>
                                         </button>
                                         <view hidden="YES" autoresizesSubviews="NO" userInteractionEnabled="NO" tag="70" contentMode="scaleToFill" id="1pd-et-5dy" userLabel="chatNotificationView" customClass="UIBouncingView">
-                                            <rect key="frame" x="302" y="8" width="22" height="22"/>
+                                            <rect key="frame" x="294" y="2" width="22" height="22"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/>
                                             <subviews>
                                                 <imageView userInteractionEnabled="NO" tag="71" contentMode="scaleAspectFit" image="history_chat_indicator.png" id="7ZF-Ch-AL1" userLabel="chatNotificationImage">
diff --git a/Classes/Base.lproj/CallView~ipad.xib b/Classes/Base.lproj/CallView~ipad.xib
index b710a3502..9f7c4b5c6 100644
--- a/Classes/Base.lproj/CallView~ipad.xib
+++ b/Classes/Base.lproj/CallView~ipad.xib
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15C50" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
@@ -552,7 +552,7 @@
                                             </connections>
                                         </button>
                                         <view hidden="YES" autoresizesSubviews="NO" userInteractionEnabled="NO" tag="70" contentMode="scaleToFill" id="d9Y-2a-CDI" userLabel="chatNotificationView" customClass="UIBouncingView">
-                                            <rect key="frame" x="353" y="8" width="44" height="22"/>
+                                            <rect key="frame" x="353" y="0.0" width="22" height="22"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/>
                                             <subviews>
                                                 <imageView userInteractionEnabled="NO" tag="71" contentMode="scaleAspectFit" image="history_chat_indicator.png" id="nPO-PM-4zJ" userLabel="chatNotificationImage">
@@ -1228,7 +1228,7 @@
                                             </connections>
                                         </button>
                                         <view hidden="YES" autoresizesSubviews="NO" userInteractionEnabled="NO" tag="70" contentMode="scaleToFill" id="1pd-et-5dy" userLabel="chatNotificationView" customClass="UIBouncingView">
-                                            <rect key="frame" x="357" y="8" width="25" height="22"/>
+                                            <rect key="frame" x="352" y="1" width="22" height="22"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/>
                                             <subviews>
                                                 <imageView userInteractionEnabled="NO" tag="71" contentMode="scaleAspectFit" image="history_chat_indicator.png" id="7ZF-Ch-AL1" userLabel="chatNotificationImage">
diff --git a/Classes/Base.lproj/ChatConversationView.xib b/Classes/Base.lproj/ChatConversationView.xib
index 09bf683cd..d955afdfd 100644
--- a/Classes/Base.lproj/ChatConversationView.xib
+++ b/Classes/Base.lproj/ChatConversationView.xib
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15C50" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
@@ -161,7 +161,7 @@
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
                             <subviews>
                                 <tableView clipsSubviews="YES" tag="13" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="none" allowsSelection="NO" allowsSelectionDuringEditing="YES" allowsMultipleSelectionDuringEditing="YES" rowHeight="60" sectionHeaderHeight="22" sectionFooterHeight="22" id="8" userLabel="messagesTableView">
-                                    <rect key="frame" x="0.0" y="0.0" width="375" height="399"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="375" height="405"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                     <gestureRecognizers/>
@@ -173,10 +173,10 @@
                                     </connections>
                                 </tableView>
                                 <view hidden="YES" tag="14" contentMode="scaleToFill" id="fx4-ao-53M" userLabel="composeIndicatorView">
-                                    <rect key="frame" x="0.0" y="404" width="375" height="22"/>
+                                    <rect key="frame" x="0.0" y="405" width="375" height="22"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                     <subviews>
-                                        <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" tag="15" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="%@ is composing..." lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="fpY-Fv-ht2" userLabel="composeLabel">
+                                        <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" tag="15" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="%@ is composing..." lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" id="fpY-Fv-ht2" userLabel="composeLabel">
                                             <rect key="frame" x="0.0" y="1" width="375" height="22"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <accessibility key="accessibilityConfiguration" label=""/>
@@ -187,7 +187,7 @@
                                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                 </view>
                                 <label hidden="YES" opaque="NO" userInteractionEnabled="NO" tag="16" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="No conversation." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="p7C-WH-uR1" userLabel="emptyTableLabel">
-                                    <rect key="frame" x="0.0" y="0.0" width="375" height="430"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="375" height="427"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
@@ -381,7 +381,7 @@
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
                             <subviews>
                                 <tableView clipsSubviews="YES" tag="13" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="none" allowsSelection="NO" allowsSelectionDuringEditing="YES" allowsMultipleSelectionDuringEditing="YES" rowHeight="60" sectionHeaderHeight="22" sectionFooterHeight="22" id="CU7-Za-RwN" userLabel="messagesTableView">
-                                    <rect key="frame" x="0.0" y="0.0" width="646" height="222"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="646" height="218"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                     <gestureRecognizers/>
@@ -391,7 +391,7 @@
                                     </connections>
                                 </tableView>
                                 <label hidden="YES" opaque="NO" userInteractionEnabled="NO" tag="16" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="No conversation." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="pzm-tk-LH0" userLabel="emptyTableLabel">
-                                    <rect key="frame" x="0.0" y="0.0" width="646" height="210"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="646" height="240"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
@@ -399,11 +399,11 @@
                                     <nil key="highlightedColor"/>
                                 </label>
                                 <view hidden="YES" tag="14" contentMode="scaleToFill" id="nTf-7h-Z4z" userLabel="composeIndicatorView">
-                                    <rect key="frame" x="0.0" y="220" width="646" height="22"/>
+                                    <rect key="frame" x="0.0" y="218" width="646" height="22"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                     <subviews>
-                                        <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" tag="15" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="%@ is composing..." lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="I34-aL-yuS" userLabel="composeLabel">
-                                            <rect key="frame" x="0.0" y="1" width="646" height="22"/>
+                                        <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" tag="15" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="%@ is composing..." lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" id="I34-aL-yuS" userLabel="composeLabel">
+                                            <rect key="frame" x="0.0" y="0.0" width="646" height="22"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <accessibility key="accessibilityConfiguration" label=""/>
                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
diff --git a/Classes/ChatConversationView.m b/Classes/ChatConversationView.m
index d8760986c..d5a595a61 100644
--- a/Classes/ChatConversationView.m
+++ b/Classes/ChatConversationView.m
@@ -307,6 +307,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 		}
 		completion:^(BOOL finished) {
 		  [_tableController scrollToBottom:TRUE];
+		  _composeIndicatorView.hidden = !visible;
 		}];
 }
 
diff --git a/Classes/LinphoneUI/Base.lproj/TabBarView.xib b/Classes/LinphoneUI/Base.lproj/TabBarView.xib
index 7acf2e997..37e1cfbc1 100644
--- a/Classes/LinphoneUI/Base.lproj/TabBarView.xib
+++ b/Classes/LinphoneUI/Base.lproj/TabBarView.xib
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15B42" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
@@ -84,7 +84,7 @@
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
                 </imageView>
                 <view hidden="YES" autoresizesSubviews="NO" userInteractionEnabled="NO" tag="7" contentMode="scaleToFill" id="37" userLabel="chatNotificationView" customClass="UIBouncingView">
-                    <rect key="frame" x="338" y="0.0" width="22" height="22"/>
+                    <rect key="frame" x="317" y="0.0" width="22" height="22"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <subviews>
                         <imageView userInteractionEnabled="NO" tag="8" contentMode="scaleAspectFit" image="history_chat_indicator.png" id="39" userLabel="chatNotificationImage">
@@ -105,7 +105,7 @@
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                 </view>
                 <view hidden="YES" autoresizesSubviews="NO" userInteractionEnabled="NO" tag="10" contentMode="scaleToFill" id="32" userLabel="historyNotificationView" customClass="UIBouncingView">
-                    <rect key="frame" x="68" y="0.0" width="22" height="22"/>
+                    <rect key="frame" x="48" y="0.0" width="22" height="22"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <subviews>
                         <imageView userInteractionEnabled="NO" tag="11" contentMode="scaleAspectFit" image="history_chat_indicator.png" id="33" userLabel="historyNotificationImage">
@@ -192,7 +192,7 @@
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                 </imageView>
                 <view hidden="YES" autoresizesSubviews="NO" userInteractionEnabled="NO" tag="7" contentMode="scaleToFill" id="djA-EL-HUt" userLabel="chatNotificationView" customClass="UIBouncingView">
-                    <rect key="frame" x="68" y="233" width="21" height="21"/>
+                    <rect key="frame" x="48" y="233" width="21" height="21"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <subviews>
                         <imageView userInteractionEnabled="NO" tag="8" contentMode="scaleAspectFit" image="history_chat_indicator.png" id="EKN-Nr-bdt" userLabel="chatNotificationImage">
@@ -213,7 +213,7 @@
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                 </view>
                 <view hidden="YES" autoresizesSubviews="NO" userInteractionEnabled="NO" tag="10" contentMode="scaleToFill" id="Ldd-jk-0kY" userLabel="historyNotificationView" customClass="UIBouncingView">
-                    <rect key="frame" x="68" y="35" width="21" height="21"/>
+                    <rect key="frame" x="46" y="35" width="21" height="21"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <subviews>
                         <imageView userInteractionEnabled="NO" tag="11" contentMode="scaleAspectFit" image="history_chat_indicator.png" id="toi-dz-eTS" userLabel="historyNotificationImage">
diff --git a/Resources/assistant_external_sip.rc b/Resources/assistant_external_sip.rc
index a02c1a8c1..f7bd40da1 100644
--- a/Resources/assistant_external_sip.rc
+++ b/Resources/assistant_external_sip.rc
@@ -12,10 +12,13 @@
 	</section>
 
 	<section name="assistant">
-		<entry name="username_min_length" overwrite="true">1</entry>
-		<entry name="password_min_length" overwrite="true">-1</entry>
-		<entry name="username_max_length" overwrite="true">-1</entry>
+		<entry name="domain" overwrite="true"></entry>
 		<entry name="password_max_length" overwrite="true">-1</entry>
+		<entry name="password_min_length" overwrite="true">-1</entry>
+		<entry name="username_length" overwrite="true">-1</entry>
+		<entry name="username_max_length" overwrite="true">-1</entry>
+		<entry name="username_min_length" overwrite="true">1</entry>
+		<entry name="username_regex" overwrite="true">.*</entry>
 		<entry name="xmlrpc_url" overwrite="true"></entry>
 	</section>
 </config>
diff --git a/Resources/assistant_linphone_create.rc b/Resources/assistant_linphone_create.rc
index b9e713e98..724d3328f 100644
--- a/Resources/assistant_linphone_create.rc
+++ b/Resources/assistant_linphone_create.rc
@@ -15,11 +15,12 @@
 
 	<section name="assistant">
 		<entry name="domain" overwrite="true">sip.linphone.org</entry>
-		<entry name="username_regex" overwrite="true">^[a-z0-9_.\-]*$</entry>
-		<entry name="username_min_length" overwrite="true">1</entry>
-		<entry name="password_min_length" overwrite="true">1</entry>
-		<entry name="username_max_length" overwrite="true">64</entry>
 		<entry name="password_max_length" overwrite="true">34</entry>
+		<entry name="password_min_length" overwrite="true">1</entry>
+		<entry name="username_length" overwrite="true">-1</entry>
+		<entry name="username_max_length" overwrite="true">64</entry>
+		<entry name="username_min_length" overwrite="true">1</entry>
+		<entry name="username_regex" overwrite="true">^[a-z0-9_.\-]*$</entry>
 		<entry name="xmlrpc_url" overwrite="true">https://www.linphone.org/assistant.php</entry>
 	</section>
 </config>
diff --git a/Resources/assistant_linphone_existing.rc b/Resources/assistant_linphone_existing.rc
index b9e713e98..724d3328f 100644
--- a/Resources/assistant_linphone_existing.rc
+++ b/Resources/assistant_linphone_existing.rc
@@ -15,11 +15,12 @@
 
 	<section name="assistant">
 		<entry name="domain" overwrite="true">sip.linphone.org</entry>
-		<entry name="username_regex" overwrite="true">^[a-z0-9_.\-]*$</entry>
-		<entry name="username_min_length" overwrite="true">1</entry>
-		<entry name="password_min_length" overwrite="true">1</entry>
-		<entry name="username_max_length" overwrite="true">64</entry>
 		<entry name="password_max_length" overwrite="true">34</entry>
+		<entry name="password_min_length" overwrite="true">1</entry>
+		<entry name="username_length" overwrite="true">-1</entry>
+		<entry name="username_max_length" overwrite="true">64</entry>
+		<entry name="username_min_length" overwrite="true">1</entry>
+		<entry name="username_regex" overwrite="true">^[a-z0-9_.\-]*$</entry>
 		<entry name="xmlrpc_url" overwrite="true">https://www.linphone.org/assistant.php</entry>
 	</section>
 </config>
diff --git a/Resources/assistant_remote.rc b/Resources/assistant_remote.rc
index 4a609218a..045029f56 100644
--- a/Resources/assistant_remote.rc
+++ b/Resources/assistant_remote.rc
@@ -10,11 +10,15 @@
 		<entry name="reg_route" overwrite="true"></entry>
 		<entry name="reg_sendregister" overwrite="true">1</entry>
 	</section>
+
 	<section name="assistant">
-		<entry name="username_min_length" overwrite="true">-1</entry>
-		<entry name="password_min_length" overwrite="true">-1</entry>
-		<entry name="username_max_length" overwrite="true">-1</entry>
+		<entry name="domain" overwrite="true"></entry>
 		<entry name="password_max_length" overwrite="true">-1</entry>
+		<entry name="password_min_length" overwrite="true">-1</entry>
+		<entry name="username_length" overwrite="true">-1</entry>
+		<entry name="username_max_length" overwrite="true">-1</entry>
+		<entry name="username_min_length" overwrite="true">-1</entry>
+		<entry name="username_regex" overwrite="true">.*</entry>
 		<entry name="xmlrpc_url" overwrite="true"></entry>
 	</section>
 </config>
diff --git a/linphone-Info.plist b/linphone-Info.plist
index 5af22d713..db412f6aa 100644
--- a/linphone-Info.plist
+++ b/linphone-Info.plist
@@ -53,7 +53,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>6</string>
+	<string>7</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIApplicationExitsOnSuspend</key>