diff --git a/android/app/build.gradle b/android/app/build.gradle
index c073afb3e..8d14c51a9 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -113,7 +113,7 @@ android {
         applicationId "com.mattermost.rnbeta"
         minSdkVersion 21
         targetSdkVersion 23
-        versionCode 126
+        versionCode 127
         versionName "1.10.0"
         ndk {
             abiFilters "armeabi-v7a", "x86"
diff --git a/app/components/autocomplete/autocomplete.js b/app/components/autocomplete/autocomplete.js
index de6d5e092..7daf48e53 100644
--- a/app/components/autocomplete/autocomplete.js
+++ b/app/components/autocomplete/autocomplete.js
@@ -85,10 +85,6 @@ export default class Autocomplete extends PureComponent {
     }
 
     render() {
-        if (!this.props.value) {
-            return null;
-        }
-
         const style = getStyleFromTheme(this.props.theme);
 
         const wrapperStyle = [];
@@ -110,6 +106,7 @@ export default class Autocomplete extends PureComponent {
             }
         }
         const listHeight = this.listHeight();
+
         return (
             <View style={wrapperStyle}>
                 <View style={containerStyle}>
diff --git a/app/components/post_textbox/post_textbox.js b/app/components/post_textbox/post_textbox.js
index d16b5d97c..0bc1cb888 100644
--- a/app/components/post_textbox/post_textbox.js
+++ b/app/components/post_textbox/post_textbox.js
@@ -424,6 +424,8 @@ export default class PostTextbox extends PureComponent {
         const {error} = await actions.executeCommand(msg, channelId, rootId);
 
         if (error) {
+            this.handleTextChange(msg);
+            this.changeDraft(msg);
             Alert.alert(
                 intl.formatMessage({
                     id: 'mobile.commands.error_title',
diff --git a/app/components/sidebars/main/main_sidebar.js b/app/components/sidebars/main/main_sidebar.js
index 75bf80b9b..11f200e54 100644
--- a/app/components/sidebars/main/main_sidebar.js
+++ b/app/components/sidebars/main/main_sidebar.js
@@ -226,7 +226,7 @@ export default class ChannelSidebar extends Component {
             return;
         }
 
-        this.selectChannel(result.data.channel, currentChannelId);
+        this.selectChannel(result.data.channel || result.data, currentChannelId);
     };
 
     onPageSelected = (index) => {
diff --git a/ios/Mattermost.xcodeproj/project.pbxproj b/ios/Mattermost.xcodeproj/project.pbxproj
index 734ac05e1..387422515 100644
--- a/ios/Mattermost.xcodeproj/project.pbxproj
+++ b/ios/Mattermost.xcodeproj/project.pbxproj
@@ -2531,7 +2531,7 @@
 				CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 126;
+				CURRENT_PROJECT_VERSION = 127;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = UQ8HT4Q2XM;
 				ENABLE_BITCODE = NO;
@@ -2581,7 +2581,7 @@
 				CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 126;
+				CURRENT_PROJECT_VERSION = 127;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = UQ8HT4Q2XM;
 				ENABLE_BITCODE = NO;
diff --git a/ios/Mattermost/Info.plist b/ios/Mattermost/Info.plist
index 7e463b6b8..efac49e5e 100644
--- a/ios/Mattermost/Info.plist
+++ b/ios/Mattermost/Info.plist
@@ -34,7 +34,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>126</string>
+	<string>127</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>
diff --git a/ios/MattermostShare/Info.plist b/ios/MattermostShare/Info.plist
index ae5afbeed..674a462bc 100644
--- a/ios/MattermostShare/Info.plist
+++ b/ios/MattermostShare/Info.plist
@@ -23,7 +23,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.10.0</string>
 	<key>CFBundleVersion</key>
-	<string>126</string>
+	<string>127</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>
diff --git a/ios/MattermostTests/Info.plist b/ios/MattermostTests/Info.plist
index ed59fe064..018e68011 100644
--- a/ios/MattermostTests/Info.plist
+++ b/ios/MattermostTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>126</string>
+	<string>127</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 4cff221e9..cb253f765 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14703,8 +14703,8 @@
       }
     },
     "react-native-fetch-blob": {
-      "version": "github:enahum/react-native-fetch-blob#729c4b49b2e2195b1793c4d3490ab67cb9a8e472",
-      "from": "github:enahum/react-native-fetch-blob#729c4b49b2e2195b1793c4d3490ab67cb9a8e472",
+      "version": "github:enahum/react-native-fetch-blob#d6017264dce8704b43a365791be42f09b66b9e9f",
+      "from": "github:enahum/react-native-fetch-blob#d6017264dce8704b43a365791be42f09b66b9e9f",
       "requires": {
         "base-64": "0.1.0",
         "glob": "7.0.6"
diff --git a/package.json b/package.json
index c359db339..59daed94f 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
     "react-native-drawer-layout": "2.0.0",
     "react-native-exception-handler": "2.7.5",
     "react-native-fast-image": "4.0.8",
-    "react-native-fetch-blob": "enahum/react-native-fetch-blob.git#729c4b49b2e2195b1793c4d3490ab67cb9a8e472",
+    "react-native-fetch-blob": "enahum/react-native-fetch-blob.git#d6017264dce8704b43a365791be42f09b66b9e9f",
     "react-native-image-gallery": "enahum/react-native-image-gallery#a98b1051e94f5a394541ca1ff9b15e2c9ffed84f",
     "react-native-image-picker": "0.26.7",
     "react-native-keyboard-aware-scroll-view": "0.5.0",