diff --git a/Classes/LinphoneUI/UIChatCell.m b/Classes/LinphoneUI/UIChatCell.m
index f731ca490..785be72e4 100644
--- a/Classes/LinphoneUI/UIChatCell.m
+++ b/Classes/LinphoneUI/UIChatCell.m
@@ -116,7 +116,12 @@
     if([chat isExternalImage] || [chat isInternalImage]) {
         [chatContentLabel setText:@""];
     } else {
-        [chatContentLabel setText:[chat message]];
+        NSString *message = [chat message];
+        // shorten long messages
+        if([message length] > 50)
+            message = [[message substringToIndex:50] stringByAppendingString:@"[...]"];
+        
+        [chatContentLabel setText:message];
     }
     
     int count = [ChatModel unreadMessages:[chat remoteContact]];