Merge branch 'master' into PLT-2115

1 files changed, 14 insertions, 12 deletions

diff --git a/web/react/components/textbox.jsx b/web/react/components/textbox.jsx
index 46900e436..d4eb60676 100644
--- a/web/react/components/textbox.jsx
+++ b/web/react/components/textbox.jsx
@@ -61,7 +61,7 @@ export default class Textbox extends React.Component {
     onRecievedError() {
         const errorCount = ErrorStore.getConnectionErrorCount();
 
-        if (errorCount > 0) {
+        if (errorCount > 1) {
             this.setState({connection: 'bad-connection'});
         } else {
             this.setState({connection: ''});
@@ -194,7 +194,6 @@ export default class Textbox extends React.Component {
                         defaultMessage='>quote'
                     />
                 </span>
-                {previewLink}
             </div>
         );
 
@@ -230,16 +229,19 @@ export default class Textbox extends React.Component {
                 >
                 </div>
                 {helpText}
-                <a
-                    target='_blank'
-                    href='http://docs.mattermost.com/help/getting-started/messaging-basics.html'
-                    className='textbox-help-link'
-                >
-                    <FormattedMessage
-                        id='textbox.help'
-                        defaultMessage='Help'
-                    />
-                </a>
+                <div className='help__text'>
+                    {previewLink}
+                    <a
+                        target='_blank'
+                        href='http://docs.mattermost.com/help/getting-started/messaging-basics.html'
+                        className='textbox-help-link'
+                    >
+                        <FormattedMessage
+                            id='textbox.help'
+                            defaultMessage='Help'
+                        />
+                    </a>
+                </div>
             </div>
         );
     }