diff --git a/Classes/LinphoneUI/UIChatBubbleTextCell.m b/Classes/LinphoneUI/UIChatBubbleTextCell.m
index c6e995661..0aabc729c 100644
--- a/Classes/LinphoneUI/UIChatBubbleTextCell.m
+++ b/Classes/LinphoneUI/UIChatBubbleTextCell.m
@@ -339,11 +339,12 @@ static const CGFloat CELL_MESSAGE_Y_MARGIN = 52; // 44;
         NSString *localVideo = [LinphoneManager getMessageAppDataForKey:@"localvideo" inMessage:chat];
         
         if(localFile) {
-            CGSize fileSize = CGSizeMake(200, 50);
+            CGSize fileSize = CGSizeMake(200, 80);
             size = [self getMediaMessageSizefromOriginalSize:fileSize withWidth:width];
         } else if (localVideo) {
             CGSize videoSize = CGSizeMake(320, 240);
             size = [self getMediaMessageSizefromOriginalSize:videoSize withWidth:width];
+            size.height += CELL_MESSAGE_X_MARGIN;
         } else {
             NSURL *imageUrl = [NSURL URLWithString:localImage];
             __block CGSize originalImageSize = CGSizeMake(0, 0);
@@ -363,8 +364,8 @@ static const CGFloat CELL_MESSAGE_Y_MARGIN = 52; // 44;
 
         size = [self getMediaMessageSizefromOriginalSize:originalImageSize withWidth:width];
         //This fixes the image being too small. I think the issue comes form the fact that the display is retina. This should probably be changed in the future.
-        }
         size.height += CELL_MESSAGE_X_MARGIN;
+        }
 	}
     
 	size.width = MAX(size.width + CELL_MESSAGE_X_MARGIN, CELL_MIN_WIDTH);