diff --git a/app/components/autocomplete/at_mention/at_mention.js b/app/components/autocomplete/at_mention/at_mention.js
index a17f79873..7fd4503b2 100644
--- a/app/components/autocomplete/at_mention/at_mention.js
+++ b/app/components/autocomplete/at_mention/at_mention.js
@@ -26,7 +26,11 @@ const getStyleFromTheme = makeStyleSheetFromTheme((theme) => {
             paddingLeft: 8,
             backgroundColor: changeOpacity(theme.centerChannelColor, 0.1),
             borderTopWidth: 1,
-            borderTopColor: changeOpacity(theme.centerChannelColor, 0.2)
+            borderTopColor: changeOpacity(theme.centerChannelColor, 0.2),
+            borderLeftWidth: 1,
+            borderLeftColor: changeOpacity(theme.centerChannelColor, 0.2),
+            borderRightWidth: 1,
+            borderRightColor: changeOpacity(theme.centerChannelColor, 0.2)
         },
         sectionText: {
             fontSize: 12,
@@ -38,11 +42,7 @@ const getStyleFromTheme = makeStyleSheetFromTheme((theme) => {
         },
         listView: {
             flex: 1,
-            backgroundColor: theme.centerChannelBg,
-            borderWidth: 1,
-            borderColor: changeOpacity(theme.centerChannelColor, 0.2),
-            borderTopWidth: 0,
-            borderBottomWidth: 0
+            backgroundColor: theme.centerChannelBg
         },
         loading: {
             alignItems: 'center',
@@ -59,7 +59,11 @@ const getStyleFromTheme = makeStyleSheetFromTheme((theme) => {
             alignItems: 'center',
             backgroundColor: theme.centerChannelBg,
             borderTopWidth: 1,
-            borderTopColor: changeOpacity(theme.centerChannelColor, 0.2)
+            borderTopColor: changeOpacity(theme.centerChannelColor, 0.2),
+            borderLeftWidth: 1,
+            borderLeftColor: changeOpacity(theme.centerChannelColor, 0.2),
+            borderRightWidth: 1,
+            borderRightColor: changeOpacity(theme.centerChannelColor, 0.2)
         },
         rowIcon: {
             color: changeOpacity(theme.centerChannelColor, 0.7),
@@ -124,7 +128,7 @@ export default class AtMention extends Component {
     }
 
     componentWillReceiveProps(nextProps) {
-        const match = nextProps.postDraft.substring(0, this.props.cursorPosition).match(AT_MENTION_REGEX);
+        const match = nextProps.postDraft.substring(0, nextProps.cursorPosition).match(AT_MENTION_REGEX);
 
         if (!match || this.state.mentionComplete) {
             this.setState({
@@ -191,7 +195,7 @@ export default class AtMention extends Component {
     }
 
     checkSpecialMentions = (term) => {
-        return this.getSpecialMentions().filter((m) => m.completeHandle.includes(term)).length > 0;
+        return this.getSpecialMentions().filter((m) => m.completeHandle.startsWith(term)).length > 0;
     }
 
     completeMention = (mention) => {
diff --git a/app/components/post_textbox/post_textbox.js b/app/components/post_textbox/post_textbox.js
index bb9901332..40efd65d7 100644
--- a/app/components/post_textbox/post_textbox.js
+++ b/app/components/post_textbox/post_textbox.js
@@ -3,6 +3,7 @@
 
 import React from 'react';
 import {
+    Platform,
     TouchableHighlight,
     View
 } from 'react-native';
@@ -143,19 +144,21 @@ export default class PostTextbox extends React.PureComponent {
                         }}
                     />
                     <View style={{width: 7}}/>
-                    <TouchableHighlight
-                        onPress={this.sendMessage}
-                        style={{
-                            height: 36,
-                            width: 36
-                        }}
-                    >
+                    <TouchableHighlight onPress={this.sendMessage}>
                         <Icon
                             name='paper-plane'
                             size={18}
                             style={{
                                 color: theme.linkColor,
-                                padding: 9
+                                ...Platform.select({
+                                    ios: {
+                                        paddingVertical: 8
+                                    },
+                                    android: {
+                                        paddingVertical: 7
+                                    }
+                                }),
+                                paddingHorizontal: 9
                             }}
                         />
                     </TouchableHighlight>