diff --git a/src/MessagesVC.mm b/src/MessagesVC.mm
index 7e72aca..a05b8c5 100644
--- a/src/MessagesVC.mm
+++ b/src/MessagesVC.mm
@@ -110,19 +110,33 @@
 
     if (conv == nil)
         return;
-    auto it = distance(conv->interactions.begin(),conv->interactions.find(uid));
-    NSIndexSet* indexSet = [NSIndexSet indexSetWithIndex:it];
+    auto it = conv->interactions.find(uid);
+    if (it == conv->interactions.end()) {
+        return;
+    }
+    auto itIndex = distance(conv->interactions.begin(),it);
+    NSIndexSet* indexSet = [NSIndexSet indexSetWithIndex:itIndex];
     //reload previous message to update bubbleview
-    if (it > 0) {
-        NSRange range = NSMakeRange(it - 1, it);
-        indexSet = [NSIndexSet indexSetWithIndexesInRange:range];
+    if (itIndex > 0) {
+        auto previousIt = it;
+        previousIt--;
+        auto previousInteraction = previousIt->second;
+        if (previousInteraction.type == lrc::api::interaction::Type::TEXT) {
+            NSRange range = NSMakeRange(itIndex - 1, 2);
+            indexSet = [NSIndexSet indexSetWithIndexesInRange:range];
+        }
     }
     if (update) {
         [conversationView noteHeightOfRowsWithIndexesChanged:indexSet];
     }
     [conversationView reloadDataForRowIndexes: indexSet
                                 columnIndexes:[NSIndexSet indexSetWithIndex:0]];
-    if (update) {
+    CGRect visibleRect = [conversationView enclosingScrollView].contentView.visibleRect;
+    NSRange range = [conversationView rowsInRect:visibleRect];
+    NSIndexSet* visibleIndexes = [NSIndexSet indexSetWithIndexesInRange:range];
+    NSUInteger lastvisibleRow = [visibleIndexes lastIndex];
+    if (([conversationView numberOfRows] > 0) &&
+        lastvisibleRow == ([conversationView numberOfRows] -1)) {
         [conversationView scrollToEndOfDocument:nil];
     }
 }
@@ -406,6 +420,7 @@
     result.msgBackground.type = type;
     [result setupForInteraction:it->first];
     bool shouldDisplayTime = (sequence == FIRST_WITH_TIME || sequence == SINGLE_WITH_TIME) ? YES : NO;
+    bool shouldApplyPadding = (sequence == FIRST_WITHOUT_TIME || sequence == SINGLE_WITHOUT_TIME) ? YES : NO;
     [result.msgBackground setNeedsDisplay:YES];
     [result setNeedsDisplay:YES];
     [result.timeBox setNeedsDisplay:YES];
@@ -416,7 +431,7 @@
 
     CGSize messageSize = [self sizeFor: @(interaction.body.c_str()) maxWidth:tableView.frame.size.width * 0.7];
 
-    [result updateMessageConstraint:messageSize.width  andHeight:messageSize.height timeIsVisible:shouldDisplayTime];
+    [result updateMessageConstraint:messageSize.width  andHeight:messageSize.height timeIsVisible:shouldDisplayTime isTopPadding: shouldApplyPadding];
     [[result.msgView textStorage] appendAttributedString:msgAttString];
     [result.msgView checkTextInDocument:nil];
 
@@ -494,10 +509,16 @@
     CGSize messageSize = [self sizeFor: @(interaction.body.c_str()) maxWidth:tableView.frame.size.width * 0.7];
     CGFloat singleLignMessageHeight = 15;
 
+    bool shouldApplyPadding = (sequence == FIRST_WITHOUT_TIME || sequence == SINGLE_WITHOUT_TIME) ? YES : NO;
+
     if (shouldDisplayTime) {
         return MAX(messageSize.height + TIME_BOX_HEIGHT + MESSAGE_TEXT_PADDING * 2,
                    TIME_BOX_HEIGHT + MESSAGE_TEXT_PADDING * 2 + singleLignMessageHeight);
     }
+    if(shouldApplyPadding) {
+        return MAX(messageSize.height + MESSAGE_TEXT_PADDING * 2 + 15,
+                   singleLignMessageHeight + MESSAGE_TEXT_PADDING * 2 + 15);
+    }
     return MAX(messageSize.height + MESSAGE_TEXT_PADDING * 2,
                singleLignMessageHeight + MESSAGE_TEXT_PADDING * 2);
 }
@@ -588,6 +609,13 @@
     bool timeChanged = [self sequenceTimeChangedFrom:interaction to:previousInteraction];
     bool authorChanged = [self sequenceAuthorChangedFrom:interaction to:previousInteraction];
     bool sequenceWillChange = [self sequenceChangedFrom:interaction to: nextInteraction];
+    if (previousInteraction.type == lrc::api::interaction::Type::OUTGOING_DATA_TRANSFER ||
+        previousInteraction.type == lrc::api::interaction::Type::INCOMING_DATA_TRANSFER) {
+        if(!sequenceWillChange) {
+            return FIRST_WITH_TIME;
+        }
+        return SINGLE_WITH_TIME;
+    }
     if (!sequenceWillChange) {
         if (!timeChanged && !authorChanged) {
             return MIDDLE_IN_SEQUENCE;
diff --git a/src/views/IMTableCellView.h b/src/views/IMTableCellView.h
index 865bd6a..d244fad 100644
--- a/src/views/IMTableCellView.h
+++ b/src/views/IMTableCellView.h
@@ -41,7 +41,7 @@
 
 - (uint64_t) interaction;
 - (void) setupForInteraction:(uint64_t)inter;
-- (void) updateMessageConstraint:(CGFloat) width andHeight: (CGFloat) height timeIsVisible: (bool) visible;
+- (void) updateMessageConstraint:(CGFloat) width andHeight: (CGFloat) height timeIsVisible: (bool) visible isTopPadding: (bool) padding;
 - (void) updateImageConstraint: (CGFloat) width andHeight: (CGFloat) height;
 - (void) invalidateImageConstraints;
 
diff --git a/src/views/IMTableCellView.mm b/src/views/IMTableCellView.mm
index 365837d..906c1b5 100644
--- a/src/views/IMTableCellView.mm
+++ b/src/views/IMTableCellView.mm
@@ -60,7 +60,7 @@
     [self.msgView setEditable:NO];
 }
 
-- (void) updateMessageConstraint:(CGFloat) width andHeight: (CGFloat) height timeIsVisible: (bool) visible
+- (void) updateMessageConstraint:(CGFloat) width andHeight: (CGFloat) height timeIsVisible: (bool) visible isTopPadding: (bool) padding
 {
     [NSLayoutConstraint deactivateConstraints:[self.msgView constraints]];
     [NSLayoutConstraint deactivateConstraints:[self.timeBox constraints]];
@@ -89,7 +89,7 @@
     NSString* formatTime = [NSString stringWithFormat:@"V:[timeBox(%@)]", TIME_BOX_HEIGHT];
     [self.timeBox setHidden:NO];
     if (!visible) {
-        formatTime = [NSString stringWithFormat:@"V:[timeBox(1)]"];
+        formatTime = padding ? [NSString stringWithFormat:@"V:[timeBox(15)]"] : [NSString stringWithFormat:@"V:[timeBox(1)]"];
         [self.timeBox setHidden:YES];
     }
     NSArray* constraintsVerticalTimeBox = [NSLayoutConstraint