diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index 059dc3f46..ae45b636e 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -101,6 +101,11 @@ typedef enum : NSUInteger {
     kMediaTypeVideo,
 } kMediaTypes;
 
+typedef enum : NSUInteger {
+    kScrollContinuityBottom = 0,
+    kScrollContinuityTop,
+} ScrollContinuity;
+
 #pragma mark -
 
 @interface ConversationViewController () <AttachmentApprovalViewControllerDelegate,
@@ -197,6 +202,8 @@ typedef enum : NSUInteger {
 
 @property (nonatomic) CGFloat scrollDistanceToBottomSnapshot;
 @property (nonatomic, nullable) NSNumber *lastKnownDistanceFromBottom;
+@property (nonatomic) ScrollContinuity scrollContinuity;
+@property (nonatomic, nullable) NSTimer *autoLoadMoreTimer;
 
 @end
 
@@ -239,6 +246,8 @@ typedef enum : NSUInteger {
 
     NSString *audioActivityDescription = [NSString stringWithFormat:@"%@ voice note", self.logTag];
     _recordVoiceNoteAudioActivity = [[OWSAudioActivity alloc] initWithAudioDescription:audioActivityDescription behavior:OWSAudioBehavior_PlayAndRecord];
+
+    self.scrollContinuity = kScrollContinuityBottom;
 }
 
 #pragma mark - Dependencies
@@ -467,6 +476,7 @@ typedef enum : NSUInteger {
 - (void)dealloc
 {
     [self.reloadTimer invalidate];
+    [self.autoLoadMoreTimer invalidate];
 }
 
 - (void)reloadTimerDidFire
@@ -800,11 +810,17 @@ typedef enum : NSUInteger {
 
 - (void)resetContentAndLayout
 {
+    self.scrollContinuity = kScrollContinuityBottom;
     // Avoid layout corrupt issues and out-of-date message subtitles.
     self.lastReloadDate = [NSDate new];
     [self.conversationViewModel viewDidResetContentAndLayout];
     [self.collectionView.collectionViewLayout invalidateLayout];
     [self.collectionView reloadData];
+
+    if (self.viewHasEverAppeared) {
+        // Try to update the lastKnownDistanceFromBottom; the content size may have changed.
+        [self updateLastKnownDistanceFromBottom];
+    }
 }
 
 - (void)setUserHasScrolled:(BOOL)userHasScrolled
@@ -3743,21 +3759,34 @@ typedef enum : NSUInteger {
 
 #pragma mark - UIScrollViewDelegate
 
-- (void)scrollViewDidScroll:(UIScrollView *)scrollView
+- (void)updateLastKnownDistanceFromBottom
 {
-    // Constantly update the lastKnownDistanceFromBottom,
-    // unless we're presenting the menu actions which
+    // Never update the lastKnownDistanceFromBottom,
+    // if we're presenting the menu actions which
     // temporarily meddles with the content insets.
     if (!OWSWindowManager.sharedManager.isPresentingMenuActions) {
         self.lastKnownDistanceFromBottom = @(self.safeDistanceFromBottom);
     }
+}
+
+- (void)scrollViewDidScroll:(UIScrollView *)scrollView
+{
+    // Constantly try to update the lastKnownDistanceFromBottom.
+    [self updateLastKnownDistanceFromBottom];
 
     [self updateLastVisibleSortId];
 
-    __weak ConversationViewController *weakSelf = self;
-    dispatch_async(dispatch_get_main_queue(), ^{
-        [weakSelf autoLoadMoreIfNecessary];
-    });
+    [self.autoLoadMoreTimer invalidate];
+    self.autoLoadMoreTimer = [NSTimer weakScheduledTimerWithTimeInterval:0.1f
+                                                                  target:self
+                                                                selector:@selector(autoLoadMoreTimerDidFire)
+                                                                userInfo:nil
+                                                                 repeats:NO];
+}
+
+- (void)autoLoadMoreTimerDidFire
+{
+    [self autoLoadMoreIfNecessary];
 }
 
 - (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView
@@ -4253,11 +4282,18 @@ typedef enum : NSUInteger {
 - (CGPoint)collectionView:(UICollectionView *)collectionView
     targetContentOffsetForProposedContentOffset:(CGPoint)proposedContentOffset
 {
-    if (self.lastKnownDistanceFromBottom) {
+    if (self.scrollContinuity == kScrollContinuityBottom && self.lastKnownDistanceFromBottom) {
         // Adjust the content offset to reflect the "last known" distance
         // from the bottom of the content.
         CGFloat contentOffsetYBottom = self.maxContentOffsetY;
-        CGFloat contentOffsetY = contentOffsetYBottom - self.lastKnownDistanceFromBottom.floatValue;
+        CGFloat contentOffsetY = contentOffsetYBottom - MAX(0, self.lastKnownDistanceFromBottom.floatValue);
+        CGFloat minContentOffsetY;
+        if (@available(iOS 11, *)) {
+            minContentOffsetY = -self.collectionView.safeAreaInsets.top;
+        } else {
+            minContentOffsetY = 0.f;
+        }
+        contentOffsetY = MAX(minContentOffsetY, contentOffsetY);
         proposedContentOffset.y = contentOffsetY;
     }
 
@@ -4290,8 +4326,8 @@ typedef enum : NSUInteger {
     // To determine that, we find the appropriate "content offset y" if
     // the scroll view were scrolled down as far as possible.  IFF the
     // actual "content offset y" is "near" that value, we return YES.
-    CGFloat contentOffsetYBottom = self.maxContentOffsetY;
-    CGFloat distanceFromBottom = contentOffsetYBottom - self.collectionView.contentOffset.y;
+    CGFloat maxContentOffsetY = self.maxContentOffsetY;
+    CGFloat distanceFromBottom = maxContentOffsetY - self.collectionView.contentOffset.y;
     return distanceFromBottom;
 }
 
@@ -4299,11 +4335,16 @@ typedef enum : NSUInteger {
 {
     CGFloat contentHeight = self.safeContentHeight;
 
+    UIEdgeInsets adjustedContentInset;
+    if (@available(iOS 11, *)) {
+        adjustedContentInset = self.collectionView.adjustedContentInset;
+    } else {
+        adjustedContentInset = self.collectionView.contentInset;
+    }
     // Note the usage of MAX() to handle the case where there isn't enough
     // content to fill the collection view at its current size.
-    CGFloat contentOffsetYBottom
-        = MAX(0.f, contentHeight + self.collectionView.contentInset.bottom - self.collectionView.bounds.size.height);
-    return contentOffsetYBottom;
+    CGFloat maxContentOffsetY = contentHeight + adjustedContentInset.bottom - self.collectionView.bounds.size.height;
+    return maxContentOffsetY;
 }
 
 #pragma mark - ContactsPickerDelegate
@@ -4517,6 +4558,8 @@ typedef enum : NSUInteger {
     // if the user is inserting new interactions.
     __block BOOL scrollToBottom = NO;
 
+    self.scrollContinuity = ([self isScrolledToBottom] ? kScrollContinuityBottom : kScrollContinuityTop);
+
     void (^batchUpdates)(void) = ^{
         OWSAssertIsOnMainThread();
 
@@ -4575,6 +4618,9 @@ typedef enum : NSUInteger {
         if (scrollToBottom) {
             [self scrollToBottomAnimated:NO];
         }
+
+        // Try to update the lastKnownDistanceFromBottom; the content size may have changed.
+        [self updateLastKnownDistanceFromBottom];
     };
 
     @try {