7 files changed, 15 insertions, 5 deletions
diff --git a/web/react/components/admin_console/email_settings.jsx b/web/react/components/admin_console/email_settings.jsx
index 3c53a8ee1..e8fb25858 100644
--- a/web/react/components/admin_console/email_settings.jsx
+++ b/web/react/components/admin_console/email_settings.jsx
@@ -300,7 +300,7 @@ export default class EmailSettings extends React.Component {
                                 type='submit'
                                 className='btn btn-primary'
                             >
-                                {'Submit'}
+                                {'Save'}
                             </button>
                         </div>
                     </div>
diff --git a/web/react/components/admin_console/jobs_settings.jsx b/web/react/components/admin_console/jobs_settings.jsx
index 34ec9693d..0b4fc4185 100644
--- a/web/react/components/admin_console/jobs_settings.jsx
+++ b/web/react/components/admin_console/jobs_settings.jsx
@@ -172,7 +172,7 @@ export default class Jobs extends React.Component {
                                 type='submit'
                                 className='btn btn-primary'
                             >
-                                {'Submit'}
+                                {'Save'}
                             </button>
                         </div>
                     </div>
diff --git a/web/react/components/change_url_modal.jsx b/web/react/components/change_url_modal.jsx
index 28fa70c1f..3553e1107 100644
--- a/web/react/components/change_url_modal.jsx
+++ b/web/react/components/change_url_modal.jsx
@@ -159,7 +159,7 @@ ChangeUrlModal.defaultProps = {
     title: 'Change URL',
     desciption: '',
     urlLabel: 'URL',
-    submitButtonText: 'Submit',
+    submitButtonText: 'Save',
     currentURL: '',
     serverError: ''
 };
diff --git a/web/react/components/search_bar.jsx b/web/react/components/search_bar.jsx
index 006d15459..77166fef9 100644
--- a/web/react/components/search_bar.jsx
+++ b/web/react/components/search_bar.jsx
@@ -75,6 +75,9 @@ export default class SearchBar extends React.Component {
         PostStore.emitSearchTermChange(false);
         this.setState({searchTerm: term});
     }
+    handleMouseInput(e) {
+        e.preventDefault();
+    }
     handleUserFocus(e) {
         e.target.select();
         $('.search-bar__container').addClass('focused');
@@ -140,6 +143,7 @@ export default class SearchBar extends React.Component {
                         value={this.state.searchTerm}
                         onFocus={this.handleUserFocus}
                         onChange={this.handleUserInput}
+                        onMouseUp={this.handleMouseInput}
                     />
                     {isSearching}
                 </form>
diff --git a/web/react/components/setting_item_max.jsx b/web/react/components/setting_item_max.jsx
index b1bab1d48..1bffa7c79 100644
--- a/web/react/components/setting_item_max.jsx
+++ b/web/react/components/setting_item_max.jsx
@@ -26,7 +26,7 @@ export default class SettingItemMax extends React.Component {
                     href='#'
                     onClick={this.props.submit}
                 >
-                    Submit
+                    Save
                 </a>
             );
         }
diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx
index 977fecb5c..697fc09c9 100644
--- a/web/react/components/sidebar.jsx
+++ b/web/react/components/sidebar.jsx
@@ -348,6 +348,11 @@ export default class Sidebar extends React.Component {
             );
         }
 
+        var badgeClass;
+        if (msgCount > 0) {
+            badgeClass = 'has-badge';
+        }
+
         // set up status icon for direct message channels
         var status = null;
         if (channel.type === 'D') {
@@ -408,7 +413,7 @@ export default class Sidebar extends React.Component {
                 className={linkClass}
             >
                 <a
-                    className={'sidebar-channel ' + titleClass}
+                    className={'sidebar-channel ' + titleClass + ' ' + badgeClass}
                     href={href}
                     onClick={handleClick}
                 >
diff --git a/web/react/stores/post_store.jsx b/web/react/stores/post_store.jsx
index 5ffe65021..29ce47300 100644
--- a/web/react/stores/post_store.jsx
+++ b/web/react/stores/post_store.jsx
@@ -297,6 +297,7 @@ class PostStoreClass extends EventEmitter {
 
         post.message = '(message deleted)';
         post.state = Constants.POST_DELETED;
+        post.filenames = [];
 
         posts[post.id] = post;
         this.storeUnseenDeletedPosts(post.channel_id, posts);