diff --git a/Classes/ChatRoomViewController.h b/Classes/ChatRoomViewController.h
index b97262562..578301aab 100644
--- a/Classes/ChatRoomViewController.h
+++ b/Classes/ChatRoomViewController.h
@@ -52,12 +52,14 @@
 @property (nonatomic, retain) IBOutlet UIView *messageView;
 @property (nonatomic, retain) IBOutlet UIImageView *messageBackgroundImage;
 @property (nonatomic, retain) IBOutlet UIImageView *footerBackgroundImage;
+@property (nonatomic, retain) IBOutlet UITapGestureRecognizer *listTapGestureRecognizer;
+
 @property (nonatomic, copy) NSString *remoteAddress;
 @property (nonatomic, retain) IBOutlet UIButton* pictButton;
 @property (nonatomic, retain) IBOutlet UIButton* cancelTransfertButton;
 @property (nonatomic, retain) IBOutlet UIProgressView* imageTransferProgressBar;
 @property (nonatomic, retain) IBOutlet UIView* transfertView;
-@property (nonatomic, retain) IBOutlet UIView* fieldBackgroundImage;
+
 
 - (IBAction)onBackClick:(id)event;
 - (IBAction)onEditClick:(id)event;
diff --git a/Classes/ChatRoomViewController.m b/Classes/ChatRoomViewController.m
index 049970f40..ffd1b36fb 100644
--- a/Classes/ChatRoomViewController.m
+++ b/Classes/ChatRoomViewController.m
@@ -42,11 +42,11 @@
 @synthesize messageView;
 @synthesize messageBackgroundImage;
 @synthesize footerBackgroundImage;
+@synthesize listTapGestureRecognizer;
 @synthesize pictButton;
 @synthesize imageTransferProgressBar;
 @synthesize cancelTransfertButton;
 @synthesize transfertView;
-@synthesize fieldBackgroundImage;
 #pragma mark - Lifecycle Functions
 
 - (id)init {
@@ -71,6 +71,11 @@
     [messageView release];
     [messageBackgroundImage release];
     [footerBackgroundImage release];
+    [listTapGestureRecognizer release];
+	[transfertView release];
+	[pictButton release];
+	[imageTransferProgressBar release];
+	[cancelTransfertButton release];
     [super dealloc];
 }
 
@@ -148,7 +153,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 								&& [[[LinphoneManager instance] lpConfigStringForKey:@"file_upload_url_preference"] length]>0 ;
 	[pictButton setHidden:!fileSharingEnabled];
 	
-	CGRect frame = transfertView.frame;
+	CGRect frame = messageView.frame;
 	if (fileSharingEnabled) {
 		frame.origin.x=61;
 		frame.size.width=175;
@@ -156,7 +161,8 @@ static UICompositeViewDescription *compositeDescription = nil;
 		frame.origin.x=0;
 		frame.size.width=175+61;
 	}
-	[transfertView setFrame:frame];
+	[messageView setFrame:frame];
+	
 }
 
 - (void)viewWillDisappear:(BOOL)animated {
@@ -330,6 +336,15 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta
 
 #pragma mark - UITextFieldDelegate Functions
 
+- (BOOL)growingTextViewShouldBeginEditing:(HPGrowingTextView *)growingTextView {
+    if(editButton.selected) {
+        [tableController setEditing:FALSE animated:TRUE];
+        [editButton setOff];
+        [listTapGestureRecognizer setEnabled:TRUE];
+    }
+    return TRUE;
+}
+
 - (void)growingTextView:(HPGrowingTextView *)growingTextView willChangeHeight:(float)height {
     int diff = height - growingTextView.bounds.size.height;
     
@@ -361,6 +376,7 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta
 }
 
 - (IBAction)onEditClick:(id)event {
+    [listTapGestureRecognizer setEnabled:[tableController isEditing]];
     [tableController setEditing:![tableController isEditing] animated:TRUE];
     [messageField resignFirstResponder];
 }
@@ -413,6 +429,7 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta
 		//[uploadCnx cancel];
 		
 	}
+	[transfertView setHidden:!isTranfer];
 	[imageTransferProgressBar setHidden:!isTranfer];
 	[cancelTransfertButton setHidden:!isTranfer];
 	[pictButton setHidden:isTranfer];
@@ -654,7 +671,7 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta
 	 You might want to generate a random boundary.. this is just the same 
 	 as my output from wireshark on a valid html post
 	 */
-	NSString *boundary = [NSString stringWithString:@"---------------------------14737809831466499882746641449"];
+	NSString *boundary =@"---------------------------14737809831466499882746641449";
 	NSString *contentType = [NSString stringWithFormat:@"multipart/form-data; boundary=%@",boundary];
 	[request addValue:contentType forHTTPHeaderField: @"Content-Type"];
 	
@@ -664,7 +681,7 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta
 	NSMutableData *body = [NSMutableData data];
 	[body appendData:[[NSString stringWithFormat:@"\r\n--%@\r\n",boundary] dataUsingEncoding:NSUTF8StringEncoding]];	
 	[body appendData:[[NSString stringWithFormat:@"Content-Disposition: form-data; name=\"userfile\"; filename=\"%@\"\r\n",name] dataUsingEncoding:NSUTF8StringEncoding]];
-	[body appendData:[[NSString stringWithString:@"Content-Type: application/octet-stream\r\n\r\n"] dataUsingEncoding:NSUTF8StringEncoding]];
+	[body appendData:[@"Content-Type: application/octet-stream\r\n\r\n" dataUsingEncoding:NSUTF8StringEncoding]];
 	[body appendData:[NSData dataWithData:imageData]];
 	[body appendData:[[NSString stringWithFormat:@"\r\n--%@--\r\n",boundary] dataUsingEncoding:NSUTF8StringEncoding]];
 	// setting the body of the post to the reqeust
diff --git a/Classes/LinphoneUI/UIChatRoomCell.m b/Classes/LinphoneUI/UIChatRoomCell.m
index e0bc54616..0ccfcce18 100644
--- a/Classes/LinphoneUI/UIChatRoomCell.m
+++ b/Classes/LinphoneUI/UIChatRoomCell.m
@@ -205,7 +205,7 @@ static UIFont *CELL_FONT = nil;
 
 #pragma mark - Action Functions
 
-- (IBAction)onDeleteClick: (id) event {
+- (IBAction)onDeleteClick:(id)event {
     if(chat != NULL) {
         UIView *view = [self superview]; 
         // Find TableViewCell
diff --git a/Classes/LinphoneUI/UIChatRoomCell.xib b/Classes/LinphoneUI/UIChatRoomCell.xib
index cda2cfccd..7710f22af 100644
--- a/Classes/LinphoneUI/UIChatRoomCell.xib
+++ b/Classes/LinphoneUI/UIChatRoomCell.xib
@@ -117,6 +117,7 @@
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<reference key="IBUIBackgroundColor" ref="765717609"/>
 								<bool key="IBUIClipsSubviews">YES</bool>
+								<bool key="IBUIUserInteractionEnabled">NO</bool>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 							</object>
 							<object class="IBUILabel" id="504194589">
@@ -334,7 +335,7 @@
 						<reference key="destination" ref="841351856"/>
 						<int key="IBEventType">7</int>
 					</object>
-					<int key="connectionID">20</int>
+					<int key="connectionID">32</int>
 				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
@@ -447,7 +448,7 @@
 				<string key="16.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="18.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="2" key="18.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
-				<real value="1" key="18.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
+				<real value="0.0" key="18.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
 				<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="22.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="26.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -461,7 +462,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">31</int>
+			<int key="maxID">32</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
diff --git a/Classes/en.lproj/ChatRoomViewController.xib b/Classes/en.lproj/ChatRoomViewController.xib
index 3bde993df..dd7c2c6ba 100644
--- a/Classes/en.lproj/ChatRoomViewController.xib
+++ b/Classes/en.lproj/ChatRoomViewController.xib
@@ -15,6 +15,7 @@
 			<string>IBUIButton</string>
 			<string>IBUIImageView</string>
 			<string>IBUILabel</string>
+			<string>IBUIProgressView</string>
 			<string>IBUITableView</string>
 			<string>IBUITableViewController</string>
 			<string>IBUITapGestureRecognizer</string>
@@ -139,7 +140,7 @@
 								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="833509359"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
-								<object class="NSColor" key="IBUIBackgroundColor">
+								<object class="NSColor" key="IBUIBackgroundColor" id="795265735">
 									<int key="NSColorSpace">3</int>
 									<bytes key="NSWhite">MQA</bytes>
 								</object>
@@ -258,6 +259,81 @@
 										<reference key="IBUIBackgroundColor" ref="460939904"/>
 										<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 									</object>
+									<object class="IBUIView" id="229066993">
+										<reference key="NSNextResponder" ref="833509359"/>
+										<int key="NSvFlags">292</int>
+										<array class="NSMutableArray" key="NSSubviews">
+											<object class="IBUIButton" id="391057061">
+												<reference key="NSNextResponder" ref="229066993"/>
+												<int key="NSvFlags">292</int>
+												<string key="NSFrame">{{238, 11}, {62, 37}}</string>
+												<reference key="NSSuperview" ref="229066993"/>
+												<reference key="NSWindow"/>
+												<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>
+												<int key="IBUIButtonType">1</int>
+												<string key="IBUINormalTitle">cancel</string>
+												<reference key="IBUIHighlightedTitleColor" ref="795265735"/>
+												<object class="NSColor" key="IBUINormalTitleColor">
+													<int key="NSColorSpace">1</int>
+													<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
+												</object>
+												<reference key="IBUINormalTitleShadowColor" ref="153071662"/>
+												<reference key="IBUIFontDescription" ref="278893601"/>
+												<reference key="IBUIFont" ref="871116895"/>
+											</object>
+											<object class="IBUIProgressView" id="164391443">
+												<reference key="NSNextResponder" ref="229066993"/>
+												<int key="NSvFlags">292</int>
+												<string key="NSFrame">{{7, 25}, {213, 9}}</string>
+												<reference key="NSSuperview" ref="229066993"/>
+												<reference key="NSWindow"/>
+												<reference key="NSNextKeyView" ref="391057061"/>
+												<string key="NSReuseIdentifierKey">_NS:9</string>
+												<bool key="IBUIOpaque">NO</bool>
+												<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+												<float key="IBUIProgress">0.5</float>
+											</object>
+										</array>
+										<string key="NSFrameSize">{320, 59}</string>
+										<reference key="NSSuperview" ref="833509359"/>
+										<reference key="NSWindow"/>
+										<reference key="NSNextKeyView" ref="164391443"/>
+										<string key="NSReuseIdentifierKey">_NS:9</string>
+										<object class="NSColor" key="IBUIBackgroundColor">
+											<int key="NSColorSpace">3</int>
+											<bytes key="NSWhite">MQA</bytes>
+											<object class="NSColorSpace" key="NSCustomColorSpace">
+												<int key="NSID">2</int>
+											</object>
+										</object>
+										<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+									</object>
+									<object class="IBUIButton" id="120263452">
+										<reference key="NSNextResponder" ref="833509359"/>
+										<int key="NSvFlags">292</int>
+										<string key="NSFrame">{{6, 11}, {50, 37}}</string>
+										<reference key="NSSuperview" ref="833509359"/>
+										<reference key="NSWindow"/>
+										<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>
+										<int key="IBUIButtonType">1</int>
+										<string key="IBUINormalTitle">Pict</string>
+										<reference key="IBUIHighlightedTitleColor" ref="795265735"/>
+										<object class="NSColor" key="IBUINormalTitleColor">
+											<int key="NSColorSpace">1</int>
+											<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
+										</object>
+										<reference key="IBUINormalTitleShadowColor" ref="153071662"/>
+										<reference key="IBUIFontDescription" ref="278893601"/>
+										<reference key="IBUIFont" ref="871116895"/>
+									</object>
 								</array>
 								<string key="NSFrame">{{0, 357}, {320, 59}}</string>
 								<reference key="NSSuperview" ref="715329044"/>
@@ -492,6 +568,46 @@
 					</object>
 					<int key="connectionID">70</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">listTapGestureRecognizer</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="148818944"/>
+					</object>
+					<int key="connectionID">71</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">transfertView</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="229066993"/>
+					</object>
+					<int key="connectionID">76</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">cancelTransfertButton</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="391057061"/>
+					</object>
+					<int key="connectionID">77</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">imageTransferProgressBar</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="164391443"/>
+					</object>
+					<int key="connectionID">79</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">pictButton</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="120263452"/>
+					</object>
+					<int key="connectionID">80</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">dataSource</string>
@@ -561,6 +677,24 @@
 					</object>
 					<int key="connectionID">62</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchEventConnection" key="connection">
+						<string key="label">onPictClick:</string>
+						<reference key="source" ref="120263452"/>
+						<reference key="destination" ref="372490531"/>
+						<int key="IBEventType">7</int>
+					</object>
+					<int key="connectionID">81</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchEventConnection" key="connection">
+						<string key="label">onTransferCancelClick:</string>
+						<reference key="source" ref="391057061"/>
+						<reference key="destination" ref="372490531"/>
+						<int key="IBEventType">7</int>
+					</object>
+					<int key="connectionID">78</int>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -679,6 +813,8 @@
 							<reference ref="487645621"/>
 							<reference ref="131075038"/>
 							<reference ref="49605932"/>
+							<reference ref="229066993"/>
+							<reference ref="120263452"/>
 						</array>
 						<reference key="parent" ref="715329044"/>
 						<string key="objectName">footerView</string>
@@ -723,6 +859,34 @@
 						<reference key="parent" ref="49605932"/>
 						<string key="objectName">messageField</string>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">72</int>
+						<reference key="object" ref="229066993"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="391057061"/>
+							<reference ref="164391443"/>
+						</array>
+						<reference key="parent" ref="833509359"/>
+						<string key="objectName">transferView</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">75</int>
+						<reference key="object" ref="391057061"/>
+						<reference key="parent" ref="229066993"/>
+						<string key="objectName">cancel</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">74</int>
+						<reference key="object" ref="164391443"/>
+						<reference key="parent" ref="229066993"/>
+						<string key="objectName">progressBar</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">73</int>
+						<reference key="object" ref="120263452"/>
+						<reference key="parent" ref="833509359"/>
+						<string key="objectName">pictureButton</string>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -752,6 +916,10 @@
 				<string key="66.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="68.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="72.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="73.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="74.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="75.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"/>
@@ -761,7 +929,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">70</int>
+			<int key="maxID">81</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -781,7 +949,9 @@
 						<string key="onEditClick:">id</string>
 						<string key="onListTap:">id</string>
 						<string key="onMessageChange:">id</string>
+						<string key="onPictClick:">id</string>
 						<string key="onSendClick:">id</string>
+						<string key="onTransferCancelClick:">id</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="actionInfosByName">
 						<object class="IBActionInfo" key="onBackClick:">
@@ -800,24 +970,37 @@
 							<string key="name">onMessageChange:</string>
 							<string key="candidateClassName">id</string>
 						</object>
+						<object class="IBActionInfo" key="onPictClick:">
+							<string key="name">onPictClick:</string>
+							<string key="candidateClassName">id</string>
+						</object>
 						<object class="IBActionInfo" key="onSendClick:">
 							<string key="name">onSendClick:</string>
 							<string key="candidateClassName">id</string>
 						</object>
+						<object class="IBActionInfo" key="onTransferCancelClick:">
+							<string key="name">onTransferCancelClick:</string>
+							<string key="candidateClassName">id</string>
+						</object>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="outlets">
 						<string key="addressLabel">UILabel</string>
 						<string key="avatarImage">UIImageView</string>
+						<string key="cancelTransfertButton">UIButton</string>
 						<string key="chatView">UIView</string>
 						<string key="editButton">UIToggleButton</string>
 						<string key="footerBackgroundImage">UIImageView</string>
 						<string key="footerView">UIView</string>
 						<string key="headerView">UIView</string>
+						<string key="imageTransferProgressBar">UIProgressView</string>
+						<string key="listTapGestureRecognizer">UITapGestureRecognizer</string>
 						<string key="messageBackgroundImage">UIImageView</string>
 						<string key="messageField">HPGrowingTextView</string>
 						<string key="messageView">UIView</string>
+						<string key="pictButton">UIButton</string>
 						<string key="sendButton">UIButton</string>
 						<string key="tableController">ChatRoomTableViewController</string>
+						<string key="transfertView">UIView</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
 						<object class="IBToOneOutletInfo" key="addressLabel">
@@ -828,6 +1011,10 @@
 							<string key="name">avatarImage</string>
 							<string key="candidateClassName">UIImageView</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="cancelTransfertButton">
+							<string key="name">cancelTransfertButton</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="chatView">
 							<string key="name">chatView</string>
 							<string key="candidateClassName">UIView</string>
@@ -848,6 +1035,14 @@
 							<string key="name">headerView</string>
 							<string key="candidateClassName">UIView</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="imageTransferProgressBar">
+							<string key="name">imageTransferProgressBar</string>
+							<string key="candidateClassName">UIProgressView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="listTapGestureRecognizer">
+							<string key="name">listTapGestureRecognizer</string>
+							<string key="candidateClassName">UITapGestureRecognizer</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="messageBackgroundImage">
 							<string key="name">messageBackgroundImage</string>
 							<string key="candidateClassName">UIImageView</string>
@@ -860,6 +1055,10 @@
 							<string key="name">messageView</string>
 							<string key="candidateClassName">UIView</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="pictButton">
+							<string key="name">pictButton</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="sendButton">
 							<string key="name">sendButton</string>
 							<string key="candidateClassName">UIButton</string>
@@ -868,6 +1067,10 @@
 							<string key="name">tableController</string>
 							<string key="candidateClassName">ChatRoomTableViewController</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="transfertView">
+							<string key="name">transfertView</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
 					</dictionary>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
diff --git a/Classes/fr.lproj/ChatRoomViewController.xib b/Classes/fr.lproj/ChatRoomViewController.xib
index 00108b6b3..d529292f6 100644
--- a/Classes/fr.lproj/ChatRoomViewController.xib
+++ b/Classes/fr.lproj/ChatRoomViewController.xib
@@ -474,6 +474,14 @@
 					</object>
 					<int key="connectionID">70</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">listTapGestureRecognizer</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="148818944"/>
+					</object>
+					<int key="connectionID">71</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">dataSource</string>
@@ -743,7 +751,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">70</int>
+			<int key="maxID">71</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -795,6 +803,7 @@
 						<string key="footerBackgroundImage">UIImageView</string>
 						<string key="footerView">UIView</string>
 						<string key="headerView">UIView</string>
+						<string key="listTapGestureRecognizer">UITapGestureRecognizer</string>
 						<string key="messageBackgroundImage">UIImageView</string>
 						<string key="messageField">HPGrowingTextView</string>
 						<string key="messageView">UIView</string>
@@ -830,6 +839,10 @@
 							<string key="name">headerView</string>
 							<string key="candidateClassName">UIView</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="listTapGestureRecognizer">
+							<string key="name">listTapGestureRecognizer</string>
+							<string key="candidateClassName">UITapGestureRecognizer</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="messageBackgroundImage">
 							<string key="name">messageBackgroundImage</string>
 							<string key="candidateClassName">UIImageView</string>
diff --git a/linphone.ldb/Contents.plist b/linphone.ldb/Contents.plist
index e446bc3c4..70072ae50 100644
--- a/linphone.ldb/Contents.plist
+++ b/linphone.ldb/Contents.plist
@@ -212,17 +212,17 @@
 					<dict>
 						<key>backup</key>
 						<dict>
-							<key>10</key>
+							<key>11</key>
 							<dict>
 								<key>class</key>
 								<string>BLWrapperHandle</string>
 								<key>name</key>
-								<string>Classes/ChatRoomViewController/10/ChatRoomViewController.xib</string>
+								<string>Classes/ChatRoomViewController/11/ChatRoomViewController.xib</string>
 							</dict>
 						</dict>
 					</dict>
 					<key>change date</key>
-					<date>2012-09-13T15:16:23Z</date>
+					<date>2012-09-13T16:01:39Z</date>
 					<key>changed values</key>
 					<array/>
 					<key>class</key>
@@ -232,7 +232,7 @@
 					<key>flags</key>
 					<integer>0</integer>
 					<key>hash</key>
-					<string>17cff3d2e83eebab4ab29a3d6e6361ce
+					<string>1017e47ad2fcb46b91d384f53e88bb41
 </string>
 					<key>name</key>
 					<string>ChatRoomViewController.xib</string>
@@ -443,9 +443,9 @@
 					<key>versions</key>
 					<dict>
 						<key>en</key>
-						<string>10</string>
+						<string>11</string>
 						<key>fr</key>
-						<string>10</string>
+						<string>11</string>
 					</dict>
 				</dict>
 				<dict>
diff --git a/linphone.ldb/Resources/Classes/ChatRoomViewController/10/ChatRoomViewController.xib b/linphone.ldb/Resources/Classes/ChatRoomViewController/11/ChatRoomViewController.xib
similarity index 98%
rename from linphone.ldb/Resources/Classes/ChatRoomViewController/10/ChatRoomViewController.xib
rename to linphone.ldb/Resources/Classes/ChatRoomViewController/11/ChatRoomViewController.xib
index 3bde993df..76a72edf1 100644
--- a/linphone.ldb/Resources/Classes/ChatRoomViewController/10/ChatRoomViewController.xib
+++ b/linphone.ldb/Resources/Classes/ChatRoomViewController/11/ChatRoomViewController.xib
@@ -492,6 +492,14 @@
 					</object>
 					<int key="connectionID">70</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">listTapGestureRecognizer</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="148818944"/>
+					</object>
+					<int key="connectionID">71</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">dataSource</string>
@@ -761,7 +769,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">70</int>
+			<int key="maxID">71</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -813,6 +821,7 @@
 						<string key="footerBackgroundImage">UIImageView</string>
 						<string key="footerView">UIView</string>
 						<string key="headerView">UIView</string>
+						<string key="listTapGestureRecognizer">UITapGestureRecognizer</string>
 						<string key="messageBackgroundImage">UIImageView</string>
 						<string key="messageField">HPGrowingTextView</string>
 						<string key="messageView">UIView</string>
@@ -848,6 +857,10 @@
 							<string key="name">headerView</string>
 							<string key="candidateClassName">UIView</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="listTapGestureRecognizer">
+							<string key="name">listTapGestureRecognizer</string>
+							<string key="candidateClassName">UITapGestureRecognizer</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="messageBackgroundImage">
 							<string key="name">messageBackgroundImage</string>
 							<string key="candidateClassName">UIImageView</string>