MessageKit · SD10 · Jan 26, 2018 · Jan 19, 2018 · Jan 19, 2018 · Jan 25, 2018
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,8 +6,16 @@ The changelog for `MessageKit`. Also see the [releases](https://github.com/Messa
 
 ## Upcoming release
 
+### [[Prerelease] 0.13.1](https://github.com/MessageKit/MessageKit/releases/tag/0.13.1)
+
 ### Fixed
 
+- Optimize `collectionView` scroll behavior when abruptly stops scrolling.
+[#470](https://github.com/MessageKit/MessageKit/pull/470) by [@zhongwuzw](https://github.com/zhongwuzw).
+
+- Fixed `messageInputBar` sendButton not disabled in some situations.
+[#475](https://github.com/MessageKit/MessageKit/pull/475) by [@zhongwuzw](https://github.com/zhongwuzw).
+
 - Fixed message bubble tail orientation invalidation in `iOS9`.
 [#469](https://github.com/MessageKit/MessageKit/pull/469) by [@zhongwuzw](https://github.com/zhongwuzw).
 

diff --git a/MessageKit.podspec b/MessageKit.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
    s.name = 'MessageKit'
-   s.version = '0.13.0'
+   s.version = '0.13.1'
    s.license = { :type => "MIT", :file => "LICENSE.md" }
 
    s.summary = 'An elegant messages UI library for iOS.'

diff --git a/Sources/Controllers/MessagesViewController+Keyboard.swift b/Sources/Controllers/MessagesViewController+Keyboard.swift
@@ -61,9 +61,9 @@ extension MessagesViewController {
             //Software keyboard is found
             let afterBottomInset = keyboardEndFrame.height > keyboardOffsetFrame.height ? (keyboardEndFrame.height - iPhoneXBottomInset) : keyboardOffsetFrame.height
             let differenceOfBottomInset = afterBottomInset - messageCollectionViewBottomInset
-            let contentOffset = CGPoint(x: messagesCollectionView.contentOffset.x, y: messagesCollectionView.contentOffset.y + differenceOfBottomInset)
 
-            if maintainPositionOnKeyboardFrameChanged {
+            if maintainPositionOnKeyboardFrameChanged && differenceOfBottomInset != 0 {
+                let contentOffset = CGPoint(x: messagesCollectionView.contentOffset.x, y: messagesCollectionView.contentOffset.y + differenceOfBottomInset)
                 messagesCollectionView.setContentOffset(contentOffset, animated: false)
             }
 

diff --git a/Sources/Views/InputBarItem.swift b/Sources/Views/InputBarItem.swift
@@ -317,7 +317,7 @@ open class InputBarButtonItem: UIButton {
     }
 
     /// An InputBarButtonItem that's spacing property is set to be .fixed with the width arguement
-    open static func fixedSpace(_ width: CGFloat) -> InputBarButtonItem {
+    open class func fixedSpace(_ width: CGFloat) -> InputBarButtonItem {
         let item = InputBarButtonItem()
         item.setSize(.zero, animated: false)
         item.spacing = .fixed(width)

diff --git a/Sources/Views/InputTextView.swift b/Sources/Views/InputTextView.swift
@@ -39,12 +39,14 @@ open class InputTextView: UITextView {
 
     open override var text: String! {
         didSet {
+            postTextViewDidChangeNotification()
             placeholderLabel.isHidden = !text.isEmpty
         }
     }
 
     open override var attributedText: NSAttributedString! {
         didSet {
+            postTextViewDidChangeNotification()
             placeholderLabel.isHidden = !text.isEmpty
         }
     }
@@ -198,6 +200,12 @@ open class InputTextView: UITextView {
         placeholderLabelConstraintSet?.right?.constant = -placeholderLabelInsets.right
     }
 
+    // MARK: - Notification
+
+    private func postTextViewDidChangeNotification() {
+        NotificationCenter.default.post(name: .UITextViewTextDidChange, object: self)
+    }
+
     // MARK: - Image Paste Support
 
     open override func canPerformAction(_ action: Selector, withSender sender: Any?) -> Bool {

diff --git a/Sources/Views/MessageInputBar.swift b/Sources/Views/MessageInputBar.swift
@@ -703,6 +703,5 @@ open class MessageInputBar: UIView {
     /// Invalidates each of the inputManagers
     open func didSelectSendButton() {
         delegate?.messageInputBar(self, didPressSendButtonWith: inputTextView.text)
-        textViewDidChange()
     }
 }