diff --git a/Podfile.lock b/Podfile.lock
index 017269b0e..003e30f93 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -193,7 +193,7 @@ CHECKOUT OPTIONS:
     :commit: 5c1c92b600f0d8094f22fff48e26ded323568194
     :git: https://github.com/Instagram/IGListKit.git
   MessageViewController:
-    :commit: ca6935cf8fc779aedd20e46c9a8b3bb3733e0ee7
+    :commit: 97e198895e309bda0b4ea30a5ac50a16fe6ef8ac
     :git: https://github.com/GitHawkApp/MessageViewController.git
   Squawk:
     :commit: 88d671bbe86e3c18d54e094fac97df12a3054d53
@@ -244,4 +244,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: abbecf20cfdc6b5d77e2ea4902ef4861ffd9a762
 
-COCOAPODS: 1.5.2
+COCOAPODS: 1.5.3
diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock
index 017269b0e..003e30f93 100644
--- a/Pods/Manifest.lock
+++ b/Pods/Manifest.lock
@@ -193,7 +193,7 @@ CHECKOUT OPTIONS:
     :commit: 5c1c92b600f0d8094f22fff48e26ded323568194
     :git: https://github.com/Instagram/IGListKit.git
   MessageViewController:
-    :commit: ca6935cf8fc779aedd20e46c9a8b3bb3733e0ee7
+    :commit: 97e198895e309bda0b4ea30a5ac50a16fe6ef8ac
     :git: https://github.com/GitHawkApp/MessageViewController.git
   Squawk:
     :commit: 88d671bbe86e3c18d54e094fac97df12a3054d53
@@ -244,4 +244,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: abbecf20cfdc6b5d77e2ea4902ef4861ffd9a762
 
-COCOAPODS: 1.5.2
+COCOAPODS: 1.5.3
diff --git a/Pods/MessageViewController/MessageViewController/MessageViewController.swift b/Pods/MessageViewController/MessageViewController/MessageViewController.swift
index 18b356de6..30b4d9866 100644
--- a/Pods/MessageViewController/MessageViewController/MessageViewController.swift
+++ b/Pods/MessageViewController/MessageViewController/MessageViewController.swift
@@ -182,15 +182,15 @@ open class MessageViewController: UIViewController, MessageAutocompleteControlle
 
             let scrollViewHeight = scrollView.bounds.height
             let contentHeight = scrollView.contentSize.height
-            let topInset = scrollView.util_adjustedContentInset.top
+            let inset = scrollView.util_adjustedContentInset
             let bottomSafeInset = self.view.util_safeAreaInsets.bottom
 
             let newOffset = max(
                 min(
-                    contentHeight - scrollViewHeight,
+                    contentHeight - scrollViewHeight + inset.bottom,
                     contentOffset.y + self.keyboardHeight - previousKeyboardHeight - bottomSafeInset
                 ),
-                -topInset
+                -inset.top
             )
             scrollView.contentOffset = CGPoint(x: contentOffset.x, y: newOffset)
         }
diff --git a/Settings.bundle/com.mono0926.LicensePlist.plist b/Settings.bundle/com.mono0926.LicensePlist.plist
index d511336fe..9c8adfe8e 100644
--- a/Settings.bundle/com.mono0926.LicensePlist.plist
+++ b/Settings.bundle/com.mono0926.LicensePlist.plist
@@ -32,7 +32,7 @@
 			<key>File</key>
 			<string>com.mono0926.LicensePlist/AutoInsetter</string>
 			<key>Title</key>
-			<string>AutoInsetter (1.2.5)</string>
+			<string>AutoInsetter (1.2.3)</string>
 			<key>Type</key>
 			<string>PSChildPaneSpecifier</string>
 		</dict>
@@ -208,7 +208,7 @@
 			<key>File</key>
 			<string>com.mono0926.LicensePlist/Pageboy</string>
 			<key>Title</key>
-			<string>Pageboy (2.5.4)</string>
+			<string>Pageboy (2.5.1)</string>
 			<key>Type</key>
 			<string>PSChildPaneSpecifier</string>
 		</dict>
@@ -264,7 +264,7 @@
 			<key>File</key>
 			<string>com.mono0926.LicensePlist/Tabman</string>
 			<key>Title</key>
-			<string>Tabman (1.9.2)</string>
+			<string>Tabman (1.8.2)</string>
 			<key>Type</key>
 			<string>PSChildPaneSpecifier</string>
 		</dict>