diff --git a/Classes/ChatRoomViewController.m b/Classes/ChatRoomViewController.m
index 399230f5f..b82d0215c 100644
--- a/Classes/ChatRoomViewController.m
+++ b/Classes/ChatRoomViewController.m
@@ -300,6 +300,11 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta
     footerRect.size.height += diff;
     [footerView setFrame:footerRect];
     
+    // Always stay at bottom
+    CGPoint contentPt = [tableController.tableView contentOffset];
+    contentPt.y += diff;
+    [tableController.tableView setContentOffset:contentPt animated:FALSE];
+    
     CGRect tableRect = [tableController.view frame];
     tableRect.size.height -= diff;
     [tableController.view setFrame:tableRect];
@@ -371,8 +376,15 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta
     {
         CGRect tableFrame = [tableController.view frame];
         tableFrame.origin.y = [headerView frame].origin.y + [headerView frame].size.height;
+        double diff = tableFrame.size.height;
         tableFrame.size.height = [footerView frame].origin.y - tableFrame.origin.y;
+        diff = tableFrame.size.height - diff;
         [tableController.view setFrame:tableFrame];
+        
+        // Always stay at bottom
+        CGPoint contentPt = [tableController.tableView contentOffset];
+        contentPt.y -= diff;
+        [tableController.tableView setContentOffset:contentPt animated:FALSE];
     }
     
     [UIView commitAnimations];
diff --git a/Classes/en.lproj/ChatViewController.xib b/Classes/en.lproj/ChatViewController.xib
index 5a413935c..69cc378e4 100644
--- a/Classes/en.lproj/ChatViewController.xib
+++ b/Classes/en.lproj/ChatViewController.xib
@@ -61,7 +61,7 @@
 							</object>
 							<object class="IBUIButton" id="174033966">
 								<reference key="NSNextResponder" ref="852221244"/>
-								<int key="NSvFlags">292</int>
+								<int key="NSvFlags">289</int>
 								<string key="NSFrame">{{160, 0}, {160, 44}}</string>
 								<reference key="NSSuperview" ref="852221244"/>
 								<reference key="NSWindow"/>
@@ -99,7 +99,7 @@
 							</object>
 							<object class="IBUIButton" id="1001279594">
 								<reference key="NSNextResponder" ref="852221244"/>
-								<int key="NSvFlags">289</int>
+								<int key="NSvFlags">292</int>
 								<string key="NSFrameSize">{160, 44}</string>
 								<reference key="NSSuperview" ref="852221244"/>
 								<reference key="NSWindow"/>
@@ -150,7 +150,6 @@
 						<string key="NSFrame">{{0, 74}, {320, 378}}</string>
 						<reference key="NSSuperview" ref="1010501960"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">1</int>
diff --git a/Classes/fr.lproj/ChatViewController.xib b/Classes/fr.lproj/ChatViewController.xib
index e9f8e254d..c19606afd 100644
--- a/Classes/fr.lproj/ChatViewController.xib
+++ b/Classes/fr.lproj/ChatViewController.xib
@@ -60,7 +60,7 @@
 							</object>
 							<object class="IBUIButton" id="174033966">
 								<reference key="NSNextResponder" ref="852221244"/>
-								<int key="NSvFlags">292</int>
+								<int key="NSvFlags">289</int>
 								<string key="NSFrame">{{160, 0}, {160, 44}}</string>
 								<reference key="NSSuperview" ref="852221244"/>
 								<reference key="NSNextKeyView" ref="490705294"/>
@@ -97,7 +97,7 @@
 							</object>
 							<object class="IBUIButton" id="1001279594">
 								<reference key="NSNextResponder" ref="852221244"/>
-								<int key="NSvFlags">289</int>
+								<int key="NSvFlags">292</int>
 								<string key="NSFrameSize">{160, 44}</string>
 								<reference key="NSSuperview" ref="852221244"/>
 								<reference key="NSNextKeyView" ref="174033966"/>
diff --git a/linphone.ldb/Contents.plist b/linphone.ldb/Contents.plist
index f37155e1a..e446bc3c4 100644
--- a/linphone.ldb/Contents.plist
+++ b/linphone.ldb/Contents.plist
@@ -453,17 +453,17 @@
 					<dict>
 						<key>backup</key>
 						<dict>
-							<key>1</key>
+							<key>2</key>
 							<dict>
 								<key>class</key>
 								<string>BLWrapperHandle</string>
 								<key>name</key>
-								<string>Classes/ChatViewController/1/ChatViewController.xib</string>
+								<string>Classes/ChatViewController/2/ChatViewController.xib</string>
 							</dict>
 						</dict>
 					</dict>
 					<key>change date</key>
-					<date>2012-09-10T15:08:28Z</date>
+					<date>2012-09-13T15:35:03Z</date>
 					<key>changed values</key>
 					<array/>
 					<key>class</key>
@@ -473,7 +473,7 @@
 					<key>flags</key>
 					<integer>0</integer>
 					<key>hash</key>
-					<string>5899ee290abaa696222088258d0de490
+					<string>d02ecf8f1bacbfa8e5793231b6735940
 </string>
 					<key>name</key>
 					<string>ChatViewController.xib</string>
@@ -587,9 +587,9 @@
 					<key>versions</key>
 					<dict>
 						<key>en</key>
-						<string>1</string>
+						<string>2</string>
 						<key>fr</key>
-						<string>1</string>
+						<string>2</string>
 					</dict>
 				</dict>
 				<dict>
diff --git a/linphone.ldb/Resources/Classes/ChatViewController/1/ChatViewController.xib b/linphone.ldb/Resources/Classes/ChatViewController/2/ChatViewController.xib
similarity index 99%
rename from linphone.ldb/Resources/Classes/ChatViewController/1/ChatViewController.xib
rename to linphone.ldb/Resources/Classes/ChatViewController/2/ChatViewController.xib
index 5a413935c..69cc378e4 100644
--- a/linphone.ldb/Resources/Classes/ChatViewController/1/ChatViewController.xib
+++ b/linphone.ldb/Resources/Classes/ChatViewController/2/ChatViewController.xib
@@ -61,7 +61,7 @@
 							</object>
 							<object class="IBUIButton" id="174033966">
 								<reference key="NSNextResponder" ref="852221244"/>
-								<int key="NSvFlags">292</int>
+								<int key="NSvFlags">289</int>
 								<string key="NSFrame">{{160, 0}, {160, 44}}</string>
 								<reference key="NSSuperview" ref="852221244"/>
 								<reference key="NSWindow"/>
@@ -99,7 +99,7 @@
 							</object>
 							<object class="IBUIButton" id="1001279594">
 								<reference key="NSNextResponder" ref="852221244"/>
-								<int key="NSvFlags">289</int>
+								<int key="NSvFlags">292</int>
 								<string key="NSFrameSize">{160, 44}</string>
 								<reference key="NSSuperview" ref="852221244"/>
 								<reference key="NSWindow"/>
@@ -150,7 +150,6 @@
 						<string key="NSFrame">{{0, 74}, {320, 378}}</string>
 						<reference key="NSSuperview" ref="1010501960"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">1</int>