                         strongSelf.conversationCollectionView.contentOffset.y += keyboardHeightIncrement
                     }
 
-                    strongSelf.conversationCollectionView.contentInset.bottom = keyboardHeight + strongSelf.messageToolbar.frame.height + subscribeViewHeight
+                    let bottom = keyboardHeight + strongSelf.messageToolbar.frame.height + subscribeViewHeight
+                    strongSelf.conversationCollectionView.contentInset.bottom = bottom
+                    strongSelf.conversationCollectionView.scrollIndicatorInsets.bottom = bottom
 
                     strongSelf.messageToolbarBottomConstraint.constant = keyboardHeight
                     strongSelf.view.layoutIfNeeded()
 
                 } else {
                     strongSelf.conversationCollectionView.contentOffset.y += keyboardHeightIncrement
-                    strongSelf.conversationCollectionView.contentInset.bottom = keyboardHeight + strongSelf.messageToolbar.frame.height + subscribeViewHeight
+                    let bottom = keyboardHeight + strongSelf.messageToolbar.frame.height + subscribeViewHeight
+                    strongSelf.conversationCollectionView.contentInset.bottom = bottom
+                    strongSelf.conversationCollectionView.scrollIndicatorInsets.bottom = bottom
 
                     strongSelf.messageToolbarBottomConstraint.constant = keyboardHeight
                     strongSelf.view.layoutIfNeeded()

            UIView.animateWithDuration(0.1, delay: 0.0, options: .CurveEaseInOut, animations: { [weak self] in
                if let strongSelf = self {
                    strongSelf.conversationCollectionView.contentInset.bottom = bottom
                }
            }, completion: { _ in })


                    strongSelf.conversationCollectionView.contentOffset.y -= keyboardHeight

                    let subscribeViewHeight = strongSelf.isSubscribeViewShowing ? SubscribeView.height : 0
                    let bottom = strongSelf.messageToolbar.frame.height + subscribeViewHeight
                    strongSelf.conversationCollectionView.contentInset.bottom = bottom
                    strongSelf.conversationCollectionView.scrollIndicatorInsets.bottom = bottom

                    strongSelf.messageToolbarBottomConstraint.constant = 0
                    strongSelf.view.layoutIfNeeded()
