diff --git a/Classes/LinphoneUI/UIChatCell.m b/Classes/LinphoneUI/UIChatCell.m
index 3e1057014..04b1e63c7 100644
--- a/Classes/LinphoneUI/UIChatCell.m
+++ b/Classes/LinphoneUI/UIChatCell.m
@@ -110,7 +110,11 @@
     [avatarImage setImage:image];
     
     // Message
-    [chatContentLabel setText:[chat message]];
+    if([chat isExternalImage] || [chat isInternalImage]) {
+        [chatContentLabel setText:@""];
+    } else {
+        [chatContentLabel setText:[chat message]];
+    }
     
     linphone_address_destroy(linphoneAddress);
 }
diff --git a/Classes/LinphoneUI/UIChatRoomCell.m b/Classes/LinphoneUI/UIChatRoomCell.m
index 8b9ac0d82..1ea21b7fc 100644
--- a/Classes/LinphoneUI/UIChatRoomCell.m
+++ b/Classes/LinphoneUI/UIChatRoomCell.m
@@ -59,6 +59,7 @@ static UIFont *CELL_FONT = nil;
                                       owner:self
                                     options:nil];
         [self addSubview:innerView];
+        [deleteButton setAlpha:0.0f];
     }
     return self;
 }
@@ -101,14 +102,14 @@ static UIFont *CELL_FONT = nil;
         return;
     }
     
-    if([UIChatRoomCell isExternalImage:[chat message]]) {
+    if([chat isExternalImage]) {
         [messageLabel setHidden:TRUE];
         
         [messageImageView setImage:nil];
         [messageImageView setHidden:TRUE];
         
         [downloadButton setHidden:FALSE];
-    } else if([UIChatRoomCell isInternalImage:[chat message]]) {
+    } else if([chat isInternalImage]) {
         [messageLabel setHidden:TRUE];
         
         [[LinphoneManager instance].photoLibrary assetForURL:[NSURL URLWithString:[chat message]] resultBlock:^(ALAsset *asset) {
@@ -176,17 +177,9 @@ static UIFont *CELL_FONT = nil;
     }
 }
 
-+ (BOOL)isExternalImage:(NSString *)message {
-    return [message hasPrefix:@"http:"] || [message hasPrefix:@"https:"];
-}
-
-+ (BOOL)isInternalImage:(NSString *)message {
-    return [message hasPrefix:@"assets-library:"];
-}
-
 + (CGSize)viewSize:(ChatModel*)chat width:(int)width {
     CGSize messageSize;
-    if(!([UIChatRoomCell isExternalImage:[chat message]] || [UIChatRoomCell isInternalImage:[chat message]])) {
+    if(!([chat isExternalImage] || [chat isInternalImage])) {
         if(CELL_FONT == nil) {
             CELL_FONT = [UIFont systemFontOfSize:CELL_FONT_SIZE];
         }
diff --git a/Classes/Model/ChatModel.h b/Classes/Model/ChatModel.h
index f8607fe9b..90d9b566e 100644
--- a/Classes/Model/ChatModel.h
+++ b/Classes/Model/ChatModel.h
@@ -41,6 +41,9 @@
 @property (copy) NSNumber *read;
 @property (copy) NSNumber *state;
 
+- (BOOL)isExternalImage;
+- (BOOL)isInternalImage;
+
 - (void)create;
 + (ChatModel*)read:(NSNumber*)id;
 - (void)update;
diff --git a/Classes/Model/ChatModel.m b/Classes/Model/ChatModel.m
index 291149373..b952df9de 100644
--- a/Classes/Model/ChatModel.m
+++ b/Classes/Model/ChatModel.m
@@ -61,6 +61,15 @@
 }
 
 
+- (BOOL)isExternalImage {
+    return [message hasPrefix:@"http:"] || [message hasPrefix:@"https:"];
+}
+
+- (BOOL)isInternalImage {
+    return [message hasPrefix:@"assets-library:"];
+}
+
+
 #pragma mark - CRUD Functions
 
 - (void)create {
diff --git a/Classes/en.lproj/ChatRoomViewController.xib b/Classes/en.lproj/ChatRoomViewController.xib
index 1972001d5..b121e1665 100644
--- a/Classes/en.lproj/ChatRoomViewController.xib
+++ b/Classes/en.lproj/ChatRoomViewController.xib
@@ -246,10 +246,7 @@
 										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="787000581"/>
 										<string key="NSReuseIdentifierKey">_NS:9</string>
-										<object class="NSColor" key="IBUIBackgroundColor">
-											<int key="NSColorSpace">1</int>
-											<bytes key="NSRGB">MSAwLjI4MzE1ODM3MjYgMC4wNTY3ODY4OTE2MQA</bytes>
-										</object>
+										<reference key="IBUIBackgroundColor" ref="460939904"/>
 										<bool key="IBUIUserInteractionEnabled">NO</bool>
 										<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 										<reference key="IBUIImage" ref="172588711"/>
@@ -271,7 +268,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">
diff --git a/Classes/fr.lproj/ChatRoomViewController.xib b/Classes/fr.lproj/ChatRoomViewController.xib
index a07b5d6da..43ba72799 100644
--- a/Classes/fr.lproj/ChatRoomViewController.xib
+++ b/Classes/fr.lproj/ChatRoomViewController.xib
@@ -236,10 +236,7 @@
 										<reference key="NSSuperview" ref="833509359"/>
 										<reference key="NSNextKeyView" ref="787000581"/>
 										<string key="NSReuseIdentifierKey">_NS:9</string>
-										<object class="NSColor" key="IBUIBackgroundColor">
-											<int key="NSColorSpace">1</int>
-											<bytes key="NSRGB">MSAwLjI4MzE1ODM3MjYgMC4wNTY3ODY4OTE2MQA</bytes>
-										</object>
+										<reference key="IBUIBackgroundColor" ref="460939904"/>
 										<bool key="IBUIUserInteractionEnabled">NO</bool>
 										<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 										<reference key="IBUIImage" ref="172588711"/>
diff --git a/linphone.ldb/Contents.plist b/linphone.ldb/Contents.plist
index febee5e56..a624c3930 100644
--- a/linphone.ldb/Contents.plist
+++ b/linphone.ldb/Contents.plist
@@ -212,17 +212,17 @@
 					<dict>
 						<key>backup</key>
 						<dict>
-							<key>16</key>
+							<key>17</key>
 							<dict>
 								<key>class</key>
 								<string>BLWrapperHandle</string>
 								<key>name</key>
-								<string>Classes/ChatRoomViewController/16/ChatRoomViewController.xib</string>
+								<string>Classes/ChatRoomViewController/17/ChatRoomViewController.xib</string>
 							</dict>
 						</dict>
 					</dict>
 					<key>change date</key>
-					<date>2012-09-18T13:03:28Z</date>
+					<date>2012-09-18T15:40:57Z</date>
 					<key>changed values</key>
 					<array/>
 					<key>class</key>
@@ -232,7 +232,7 @@
 					<key>flags</key>
 					<integer>0</integer>
 					<key>hash</key>
-					<string>fb9acb898a88e8d219dfd663e9b8eb19
+					<string>0d54842000213c11a77cc9d1e2698245
 </string>
 					<key>name</key>
 					<string>ChatRoomViewController.xib</string>
@@ -568,9 +568,9 @@
 					<key>versions</key>
 					<dict>
 						<key>en</key>
-						<string>16</string>
+						<string>17</string>
 						<key>fr</key>
-						<string>16</string>
+						<string>17</string>
 					</dict>
 				</dict>
 				<dict>
diff --git a/linphone.ldb/Resources/Classes/ChatRoomViewController/16/ChatRoomViewController.xib b/linphone.ldb/Resources/Classes/ChatRoomViewController/17/ChatRoomViewController.xib
similarity index 99%
rename from linphone.ldb/Resources/Classes/ChatRoomViewController/16/ChatRoomViewController.xib
rename to linphone.ldb/Resources/Classes/ChatRoomViewController/17/ChatRoomViewController.xib
index 1972001d5..b121e1665 100644
--- a/linphone.ldb/Resources/Classes/ChatRoomViewController/16/ChatRoomViewController.xib
+++ b/linphone.ldb/Resources/Classes/ChatRoomViewController/17/ChatRoomViewController.xib
@@ -246,10 +246,7 @@
 										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="787000581"/>
 										<string key="NSReuseIdentifierKey">_NS:9</string>
-										<object class="NSColor" key="IBUIBackgroundColor">
-											<int key="NSColorSpace">1</int>
-											<bytes key="NSRGB">MSAwLjI4MzE1ODM3MjYgMC4wNTY3ODY4OTE2MQA</bytes>
-										</object>
+										<reference key="IBUIBackgroundColor" ref="460939904"/>
 										<bool key="IBUIUserInteractionEnabled">NO</bool>
 										<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 										<reference key="IBUIImage" ref="172588711"/>
@@ -271,7 +268,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">