                 let text = messageToolbar.messageTextView.text!.trimming(.WhitespaceAndNewline)
 
                 self?.cleanTextInput()
+
+                self?.snapContentOfConversationCollectionViewToBottom()
 
                 if text.isEmpty {
                     return

        feedView.heightConstraint = height

        self.feedView = feedView
    }

    // MARK: Private


            messageToolbar.stateTransitionAction = { [weak self] (messageToolbar, previousState, currentState) in

                switch currentState {

                case .BeginTextInput:
                    self?.tryFoldFeedView()

                    self?.snapContentOfConversationCollectionViewToBottom(forceAnimation: true)

                case .TextInputing:
                    self?.snapContentOfConversationCollectionViewToBottom()

                default:
                    break
                }
            }

